diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
index 0c2f645da..4a1dcadd3 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
@@ -60,4 +60,11 @@ class AndroidThemeSwitcher
         activity.window.navigationBarColor =
                 ContextCompat.getColor(activity, R.color.black)
     }
+
+    fun getDialogTheme(): Int {
+        return when {
+            isNightMode -> R.style.DarkDialogWithTitle
+            else -> R.style.DialogWithTitle
+        }
+    }
 }
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt
index ed6906b74..3a837c937 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt
@@ -51,5 +51,5 @@ interface HabitsActivityComponent {
     val listHabitsScreen: ListHabitsScreen
     val listHabitsSelectionMenu: ListHabitsSelectionMenu
     val showHabitScreen: ShowHabitScreen
-    val themeSwitcher: ThemeSwitcher
+    val themeSwitcher: AndroidThemeSwitcher
 }
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
index e9e5c5ee3..6ff96bb3b 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
@@ -41,7 +41,6 @@ import org.isoron.uhabits.core.preferences.*;
 import butterknife.*;
 
 import static android.view.View.GONE;
-import static org.isoron.uhabits.core.ui.ThemeSwitcher.THEME_LIGHT;
 
 public class EditHabitDialog extends AppCompatDialogFragment
 {
@@ -78,13 +77,8 @@ public class EditHabitDialog extends AppCompatDialogFragment
     @Override
     public int getTheme()
     {
-        HabitsApplicationComponent component =
-            ((HabitsApplication) getContext().getApplicationContext()).getComponent();
-
-        if(component.getPreferences().getTheme() == THEME_LIGHT)
-            return R.style.DialogWithTitle;
-        else
-            return R.style.DarkDialogWithTitle;
+        HabitsActivity activity = (HabitsActivity) getActivity();
+        return activity.getComponent().getThemeSwitcher().getDialogTheme();
     }
 
     @Override