diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
index 53d12a28c..bc29429f4 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
@@ -73,6 +73,16 @@ class ListHabitsMenu @Inject constructor(
                 return true
             }
 
+            R.id.actionCreateBooleanHabit -> {
+                behavior.onCreateBooleanHabit()
+                return true
+            }
+
+            R.id.actionCreateNumeralHabit -> {
+                behavior.onCreateNumericalHabit()
+                return true
+            }
+
             R.id.actionFAQ -> {
                 behavior.onViewFAQ()
                 return true
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
index bda22a46e..a5ba91425 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -137,11 +137,16 @@ class ListHabitsScreen
         activity.startActivity(intent)
     }
 
-    fun showCreateBooleanHabitScreen() {
+    override fun showCreateBooleanHabitScreen() {
         val dialog = editHabitDialogFactory.createBoolean()
         activity.showDialog(dialog, "editHabit")
     }
 
+    override fun showCreateNumericalHabitScreen() {
+        val dialog = editHabitDialogFactory.createNumerical()
+        activity.showDialog(dialog, "editHabit")
+    }
+
     override fun showCreateHabitScreen() {
         if (!preferences.isNumericalHabitsFeatureEnabled) {
             showCreateBooleanHabitScreen()
@@ -236,11 +241,6 @@ class ListHabitsScreen
         }
     }
 
-    private fun showCreateNumericalHabitScreen() {
-        val dialog = editHabitDialogFactory.createNumerical()
-        activity.showDialog(dialog, "editHabit")
-    }
-
     private fun onImportData(file: File, onFinished: () -> Unit) {
         taskRunner.execute(importTaskFactory.create(file) { result ->
             if (result == ImportDataTask.SUCCESS) {
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
index daa8b8dd8..74a2baaf2 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
@@ -74,6 +74,16 @@ public class ListHabitsMenuBehavior
         }
     }
 
+    public void onCreateBooleanHabit()
+    {
+        screen.showCreateBooleanHabitScreen();
+    }
+
+    public void onCreateNumericalHabit()
+    {
+        screen.showCreateNumericalHabitScreen();
+    }
+
     public void onViewFAQ()
     {
         screen.showFAQScreen();
@@ -155,6 +165,10 @@ public class ListHabitsMenuBehavior
 
         void showCreateHabitScreen();
 
+        void showCreateBooleanHabitScreen();
+
+        void showCreateNumericalHabitScreen();
+
         void showFAQScreen();
 
         void showSettingsScreen();