diff --git a/lib/ui/theme/dynamic_theme_builder.dart b/lib/ui/theme/dynamic_theme_builder.dart
index 5fcd8831..233c78b5 100644
--- a/lib/ui/theme/dynamic_theme_builder.dart
+++ b/lib/ui/theme/dynamic_theme_builder.dart
@@ -90,7 +90,7 @@ class _DynamicThemeBuilderState extends State<DynamicThemeBuilder> with WidgetsB
               4: darkCustomTheme,
               5: darkDynamicTheme,
             },
-            fallbackTheme: brightness == Brightness.light ? lightCustomTheme : darkCustomTheme,
+            fallbackTheme: PlatformDispatcher.instance.platformBrightness == Brightness.light ? lightCustomTheme : darkCustomTheme,
           ),
           builder: (context, theme) => MaterialApp(
                 debugShowCheckedModeBanner: false,
diff --git a/lib/ui/views/settings/settingsFragment/settings_update_theme.dart b/lib/ui/views/settings/settingsFragment/settings_update_theme.dart
index 1abd0f8c..1d15a168 100644
--- a/lib/ui/views/settings/settingsFragment/settings_update_theme.dart
+++ b/lib/ui/views/settings/settingsFragment/settings_update_theme.dart
@@ -157,6 +157,7 @@ class SUpdateThemeUI extends StatelessWidget {
             label: sUpdateTheme.getThemeModeName(),
             onPressed: () => { sUpdateTheme.showThemeDialog(context) },
           ),
+          onTap: () => { sUpdateTheme.showThemeDialog(context) },
         ),
         FutureBuilder<int>(
           future: _settingViewModel.getSdkVersion(),