diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
index 60b079738..edb8eb5ee 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
@@ -35,6 +35,9 @@ class ShowHabitMenu(
         if (preferences.isDeveloper) {
             menu.findItem(R.id.action_randomize).isVisible = true
         }
+        menu.findItem(R.id.action_archive_habit).isVisible = presenter.canArchive()
+        menu.findItem(R.id.action_unarchive_habit).isVisible = presenter.canUnarchive()
+
         return true
     }
 
@@ -44,6 +47,15 @@ class ShowHabitMenu(
                 presenter.onEditHabit()
                 return true
             }
+            R.id.action_archive_habit -> {
+                presenter.onArchiveHabits()
+                return true
+            }
+
+            R.id.action_unarchive_habit -> {
+                presenter.onUnarchiveHabits()
+                return true
+            }
             R.id.action_delete -> {
                 presenter.onDeleteHabit()
                 return true
diff --git a/uhabits-android/src/main/res/menu/show_habit.xml b/uhabits-android/src/main/res/menu/show_habit.xml
index 9dd2386db..d49a817f1 100644
--- a/uhabits-android/src/main/res/menu/show_habit.xml
+++ b/uhabits-android/src/main/res/menu/show_habit.xml
@@ -26,6 +26,16 @@
         android:title="@string/export"
         app:showAsAction="never"/>
 
+    <item
+        android:id="@+id/action_archive_habit"
+        android:title="@string/archive"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_unarchive_habit"
+        android:title="@string/unarchive"
+        app:showAsAction="never"/>
+
     <item
         android:id="@+id/action_delete"
         android:title="@string/delete"
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt
index 4ea4bc854..e6cc649d6 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt
@@ -19,6 +19,8 @@
 package org.isoron.uhabits.core.ui.screens.habits.show
 
 import org.isoron.uhabits.core.commands.CommandRunner
+import org.isoron.uhabits.core.commands.ArchiveHabitsCommand
+import org.isoron.uhabits.core.commands.UnarchiveHabitsCommand
 import org.isoron.uhabits.core.commands.DeleteHabitsCommand
 import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.models.Habit
@@ -40,10 +42,23 @@ class ShowHabitMenuPresenter(
     private val system: System,
     private val taskRunner: TaskRunner
 ) {
+
+    fun canArchive(): Boolean {
+        return !(habit.isArchived)
+    }
+
+    fun canUnarchive(): Boolean {
+        return habit.isArchived
+    }
+
     fun onEditHabit() {
         screen.showEditHabitScreen(habit)
     }
 
+    fun onArchiveHabits() {
+        commandRunner.run(ArchiveHabitsCommand(habitList,listOf(habit)))
+    }
+
     fun onExportCSV() {
         val outputDir = system.getCSVOutputDir()
         taskRunner.execute(
@@ -64,6 +79,10 @@ class ShowHabitMenuPresenter(
         }
     }
 
+    fun onUnarchiveHabits() {
+        commandRunner.run(UnarchiveHabitsCommand(habitList,listOf(habit)))
+    }
+
     fun onRandomize() {
         val random = Random()
         habit.originalEntries.clear()