diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt
index 2635e77..172ca33 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt
@@ -7,6 +7,7 @@ import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.annotation.ColorInt
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -54,7 +55,8 @@ class BrightDisplayActivity : ComponentActivity() {
         enableEdgeToEdgeSimple()
         setContent {
             AppThemeSurface {
-                val colorPickerDialogState = getColorPickerDialogState()
+                val brightDisplayColor by preferences.brightDisplayColorFlow.collectAsStateWithLifecycle(preferences.brightDisplayColor)
+                val colorPickerDialogState = getColorPickerDialogState(brightDisplayColor)
 
                 ScreenContent(colorPickerDialogState::show)
             }
@@ -66,8 +68,10 @@ class BrightDisplayActivity : ComponentActivity() {
     }
 
     @Composable
-    private fun getColorPickerDialogState() = rememberAlertDialogState().apply {
-        val brightDisplayColor by preferences.brightDisplayColorFlow.collectAsStateWithLifecycle(preferences.brightDisplayColor)
+    private fun getColorPickerDialogState(
+        @ColorInt
+        brightDisplayColor: Int
+    ) = rememberAlertDialogState().apply {
         DialogMember {
             ColorPickerAlertDialog(
                 alertDialogState = this,
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
index 8a1950e..6fe73b7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.annotation.ColorInt
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -42,7 +43,7 @@ class WidgetBrightDisplayConfigureActivity : ComponentActivity() {
                 val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle()
                 val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle()
 
-                val colorPickerDialogState = getColorPickerDialogState()
+                val colorPickerDialogState = getColorPickerDialogState(widgetColor)
 
                 WidgetConfigureScreen(
                     widgetDrawable = R.drawable.ic_bright_display_vector,
@@ -60,12 +61,14 @@ class WidgetBrightDisplayConfigureActivity : ComponentActivity() {
     }
 
     @Composable
-    private fun getColorPickerDialogState() = rememberAlertDialogState().apply {
-        val brightDisplayColor by viewModel.widgetColor.collectAsStateWithLifecycle()
+    private fun getColorPickerDialogState(
+        @ColorInt
+        widgetColor: Int
+    ) = rememberAlertDialogState().apply {
         DialogMember {
             ColorPickerAlertDialog(
                 alertDialogState = this,
-                color = brightDisplayColor,
+                color = widgetColor,
                 removeDimmedBackground = true,
                 onActiveColorChange = {},
                 onButtonPressed = { wasPositivePressed, color ->
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
index bff2c24..1c9f126 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.annotation.ColorInt
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -43,7 +44,7 @@ class WidgetTorchConfigureActivity : ComponentActivity() {
                 val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle()
                 val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle()
 
-                val colorPickerDialogState = getColorPickerDialogState()
+                val colorPickerDialogState = getColorPickerDialogState(widgetColor)
 
                 WidgetConfigureScreen(
                     widgetDrawable = R.drawable.ic_flashlight_vector,
@@ -60,12 +61,14 @@ class WidgetTorchConfigureActivity : ComponentActivity() {
     }
 
     @Composable
-    private fun getColorPickerDialogState() = rememberAlertDialogState().apply {
-        val brightDisplayColor by viewModel.widgetColor.collectAsStateWithLifecycle()
+    private fun getColorPickerDialogState(
+        @ColorInt
+        widgetColor: Int
+    ) = rememberAlertDialogState().apply {
         DialogMember {
             ColorPickerAlertDialog(
                 alertDialogState = this,
-                color = brightDisplayColor,
+                color = widgetColor,
                 removeDimmedBackground = true,
                 onActiveColorChange = {},
                 onButtonPressed = { wasPositivePressed, color ->