diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
index 88e271a75..98cb8b595 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
@@ -53,6 +53,7 @@ class CheckmarkDialog : AppCompatDialogFragment() {
                 if (description.isNotEmpty()) {
                     view.habitDescription.text = description
                     view.habitDescription.visibility = VISIBLE
+                    view.habitDescription.setTextColor(color)
                 } else {
                     view.habitDescription.visibility = GONE
                 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
index 5eb66e226..c9e1f64c7 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
@@ -36,6 +36,7 @@ class NumberDialog : AppCompatDialogFragment() {
         val appComponent = (requireActivity().application as HabitsApplication).component
         val prefs = appComponent.preferences
         view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context))
+        val color = requireArguments().getInt("color")
 
         // Get the habit ID and load description
         val habitId = requireArguments().getLong("habitId", -1)
@@ -46,6 +47,7 @@ class NumberDialog : AppCompatDialogFragment() {
                 if (description.isNotEmpty()) {
                     view.habitDescription.text = description
                     view.habitDescription.visibility = View.VISIBLE
+                    view.habitDescription.setTextColor(color)
                 } else {
                     view.habitDescription.visibility = View.GONE
                 }
@@ -55,7 +57,7 @@ class NumberDialog : AppCompatDialogFragment() {
         }
 
         arrayOf(view.yesBtn).forEach {
-            it.setTextColor(requireArguments().getInt("color"))
+            it.setTextColor(color)
         }
         arrayOf(view.noBtn, view.unknownBtnNumber).forEach {
             it.setTextColor(view.root.sres.getColor(R.attr.contrast60))
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
index 8b16f44fa..bbfad4489 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -273,9 +273,11 @@ class ListHabitsScreen
         callback: ListHabitsBehavior.NumberPickerCallback,
         habit: Habit?
     ) {
+        val theme = rootView.get().currentTheme()
         val fm = (context as AppCompatActivity).supportFragmentManager
         val dialog = NumberDialog()
         dialog.arguments = Bundle().apply {
+            habit?.color?.let { putInt("color", theme.color(it).toInt()) }
             putDouble("value", value)
             putString("notes", notes)
             habit?.id?.let { putLong("habitId", it) }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
index 3ae9a5c90..1db5566ed 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
@@ -176,8 +176,10 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
             callback: ListHabitsBehavior.NumberPickerCallback,
             habit: Habit?
         ) {
+            val theme = view.currentTheme()
             val dialog = NumberDialog()
             dialog.arguments = Bundle().apply {
+                habit?.color?.let { putInt("color", theme.color(it).toInt()) }
                 putDouble("value", value)
                 putString("notes", notes)
                 putLong("habitId", habit?.id ?: -1)