diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
index f77bbea..eb54d68 100644
--- a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
@@ -93,20 +93,20 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
 
 
         bindSwitchToPref(settings_launcher_switch_screen_timeout, PREF_SCREEN_TIMEOUT_DISABLED, false) {
-            setWindowFlags(activity!!.window)
+            activity?.let{setWindowFlags(it.window)}
         }
         bindSwitchToPref(settings_launcher_switch_screen_full, PREF_SCREEN_FULLSCREEN, true) {
-            setWindowFlags(activity!!.window)
+            activity?.let{setWindowFlags(it.window)}
         }
         bindSwitchToPref(settings_launcher_switch_auto_launch, PREF_SEARCH_AUTO_LAUNCH, false) {}
         bindSwitchToPref(settings_launcher_switch_auto_keyboard, PREF_SEARCH_AUTO_KEYBOARD, true) {}
         bindSwitchToPref(settings_launcher_switch_enable_double, PREF_DOUBLE_ACTIONS_ENABLED, false) {
             intendedSettingsPause = true
-            activity!!.recreate()
+            activity?.recreate()
         }
         bindSwitchToPref(settings_launcher_switch_enable_edge, PREF_EDGE_ACTIONS_ENABLED, false) {
             intendedSettingsPause = true
-            activity!!.recreate()
+            activity?.recreate()
         }
 
         settings_seekbar_sensitivity.setOnSeekBarChangeListener(