diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33b160e22..c584353fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## [2.0.3] - [Unreleased]
 ### Fixed
 - Improve automatic checkmarks for monthly habits (@iSoron, 947)
-- Fix small issues with the pure black theme (@iSoron)
+- Fix small theme issues (@iSoron)
 
 ## [2.0.2] - 2021-05-23
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
index 2383b3683..f23394369 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
@@ -31,6 +31,7 @@ import android.widget.ListView
 import android.widget.TextView
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.core.preferences.WidgetPreferences
 import org.isoron.uhabits.widgets.WidgetUpdater
 import java.util.ArrayList
@@ -58,11 +59,13 @@ open class HabitPickerDialog : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val component = (applicationContext as HabitsApplication).component
+        AndroidThemeSwitcher(this, component.preferences).apply()
         val habitList = component.habitList
         widgetPreferences = component.widgetPreferences
         widgetUpdater = component.widgetUpdater
         widgetId = intent.extras?.getInt(EXTRA_APPWIDGET_ID, INVALID_APPWIDGET_ID) ?: 0
 
+
         val habitIds = ArrayList<Long>()
         val habitNames = ArrayList<String>()
         for (h in habitList) {