diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 241f10a..8cbc7ed 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
         </activity>
         <activity
             android:name="de.jrpie.android.launcher.ui.list.ListActivity"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="adjustResize" >
         </activity>
         <activity
@@ -51,7 +52,6 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-
     </application>
 
 </manifest>
diff --git a/app/src/main/java/de/jrpie/android/launcher/Application.kt b/app/src/main/java/de/jrpie/android/launcher/Application.kt
index 6f0aaad..88a0fb3 100644
--- a/app/src/main/java/de/jrpie/android/launcher/Application.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/Application.kt
@@ -9,5 +9,6 @@ class Application : android.app.Application() {
 
         val preferences = PreferenceManager.getDefaultSharedPreferences(this)
         LauncherPreferences.init(preferences, this.resources)
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
index ba5f260..bcd255f 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
@@ -64,7 +64,8 @@ class HomeActivity : UIObject, AppCompatActivity(),
     private var clockTimer = Timer()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+        super<AppCompatActivity>.onCreate(savedInstanceState)
+        super<UIObject>.onCreate()
 
         // Try to restore old preferences
         migratePreferencesToNewVersion(this)
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt b/app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt
index 94bf347..b352d95 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt
@@ -37,16 +37,17 @@ fun setWindowFlags(window: Window, homeScreen: Boolean) {
 }
 
 interface UIObject {
-    fun onStart() {
+    fun onCreate() {
         if (this is Activity) {
             setWindowFlags(window, isHomeScreen())
-            requestedOrientation = if (!LauncherPreferences.display().rotateScreen()) {
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-            } else {
-                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-            }
-        }
 
+            if (!LauncherPreferences.display().rotateScreen()) {
+                requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
+            }
+
+        }
+    }
+    fun onStart() {
         setOnClicks()
         adjustLayout()
     }
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/list/ListActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/list/ListActivity.kt
index 1074fb4..4f5bfb1 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/list/ListActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/list/ListActivity.kt
@@ -49,7 +49,8 @@ class ListActivity : AppCompatActivity(), UIObject {
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+        super<AppCompatActivity>.onCreate(savedInstanceState)
+        super<UIObject>.onCreate()
 
         // get info about which action this activity is open for
         intent.extras?.let { bundle ->
@@ -106,6 +107,9 @@ class ListActivity : AppCompatActivity(), UIObject {
 
     override fun onPause() {
         super.onPause()
+
+        // ensure that the activity closes then an app is launched
+        // and when the user navigates to recent apps
         finish()
     }
 
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/settings/SettingsActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/settings/SettingsActivity.kt
index f509235..e46a956 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/settings/SettingsActivity.kt
@@ -44,7 +44,9 @@ class SettingsActivity : AppCompatActivity(), UIObject {
     private lateinit var binding: SettingsBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+        super<AppCompatActivity>.onCreate(savedInstanceState)
+        super<UIObject>.onCreate()
+
 
         // Initialise layout
         binding = SettingsBinding.inflate(layoutInflater)
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/tutorial/TutorialActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/tutorial/TutorialActivity.kt
index 490f42d..28e2e02 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/tutorial/TutorialActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/tutorial/TutorialActivity.kt
@@ -30,7 +30,8 @@ import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragmentUsage
 class TutorialActivity : AppCompatActivity(), UIObject {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+        super<AppCompatActivity>.onCreate(savedInstanceState)
+        super<UIObject>.onCreate()
 
         // Initialise layout
         setContentView(R.layout.tutorial)