diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml
index 1ff10c036..6b68ae9ba 100644
--- a/app/src/main/res/layout/edit_habit.xml
+++ b/app/src/main/res/layout/edit_habit.xml
@@ -63,7 +63,7 @@
 
             <Spinner
                 android:id="@+id/sFrequency"
-                style="@style/dialogFormSpinner"
+                style="?dialogFormSpinnerTheme"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:entries="@array/frequencyQuickSelect"
@@ -111,7 +111,7 @@
 
             <TextView
                 android:id="@+id/inputReminderTime"
-                style="@style/dialogFormSpinner"/>
+                style="?dialogFormSpinnerTheme"/>
         </LinearLayout>
 
         <LinearLayout
@@ -125,7 +125,7 @@
 
             <TextView
                 android:id="@+id/inputReminderDays"
-                style="@style/dialogFormSpinner"/>
+                style="?dialogFormSpinnerTheme"/>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 0264d2dc2..b40379a51 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -52,6 +52,7 @@
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
         <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
+        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerLight</item>
 
         <item name="aboutScreenColor">@color/blue_700</item>
     </style>
@@ -87,6 +88,7 @@
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
         <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerDark</item>
 
         <item name="palette">@array/darkPalette</item>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index fac514547..635482207 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -42,6 +42,7 @@
     <attr name="iconUnarchive" format="reference"/>
     <attr name="dialogIconChangeColor" format="reference"/>
 
+    <attr name="dialogFormSpinnerTheme" format="reference"/>
 
     <!-- Pre-Lollipop -->
     <attr name="cardBackground" format="reference"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5fd7339f4..bf6bc4b2f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,9 +20,6 @@
 <resources>
 
     <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
-        <item name="android:spinnerItemStyle">@style/dialogFormText</item>
-        <item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
-
         <item name="selectedBackground">@drawable/selected_box_light</item>
         <item name="headerBackground">@drawable/habits_list_header_light_background</item>
         <item name="cardBackground">@drawable/card_light_background</item>
@@ -48,6 +45,7 @@
         <item name="iconUnarchive">@drawable/ic_action_unarchive_light</item>
         <item name="iconChangeColor">@drawable/ic_action_color_light</item>
         <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
+        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerLight</item>
 
         <item name="aboutScreenColor">@color/blue_700</item>
     </style>
@@ -77,6 +75,7 @@
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
         <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerDark</item>
 
         <item name="palette">@array/darkPalette</item>
 
diff --git a/app/src/main/res/values/styles_dialog.xml b/app/src/main/res/values/styles_dialog.xml
index 7d17f0112..a5a336f90 100644
--- a/app/src/main/res/values/styles_dialog.xml
+++ b/app/src/main/res/values/styles_dialog.xml
@@ -77,7 +77,16 @@
         <item name="android:textColor">?mediumContrastTextColor</item>
     </style>
 
-    <style name="dialogFormSpinner" parent="android:Widget.DeviceDefault.Light.Spinner">
+    <style name="dialogFormSpinnerDark" parent="android:Widget.DeviceDefault.Spinner">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:textSize">@dimen/regularTextSize</item>
+        <item name="android:minWidth">400dp</item>
+        <item name="android:textColor">?highContrastTextColor</item>
+    </style>
+
+    <style name="dialogFormSpinnerLight" parent="android:Widget.DeviceDefault.Light.Spinner">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingLeft">12dp</item>