diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c7cc4163662f586de5e4af00af54f8e0f0da20e..804cea9807e929fed008d7f62b15aa2e09fcb3ac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,7 +30,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt b/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt
index 7d42e6b9f9ac4665685d9b55fd82043c088bec57..32dd6528017db2057c5679f2cbf54ac649d4211f 100644
--- a/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt
+++ b/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt
@@ -22,6 +22,7 @@ import android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -73,6 +74,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.colorResource
@@ -148,13 +150,11 @@ class MainActivity : ComponentActivity() {
     fun SetRestrictionsScreen() {
         BackHandler(onBack = { onStartUp() })
         CustomTopAppBar(title = stringResource(R.string.app_name), onClick = { onStartUp() })
-        val scrollState = rememberScrollState()
 
         Column(
             modifier =
                 Modifier.fillMaxSize()
-                    .padding(start = Dimens.SCREEN_PADDING, end = Dimens.SCREEN_PADDING)
-                    .verticalScroll(scrollState),
+                    .padding(start = Dimens.SCREEN_PADDING, end = Dimens.SCREEN_PADDING),
             horizontalAlignment = Alignment.Start,
         ) {
             MainUI(mActivity).SetRestrictionsScreen()
@@ -882,8 +882,15 @@ class MainActivity : ComponentActivity() {
                 window.statusBarColor = MaterialTheme.colorScheme.background.toArgb()
                 window.navigationBarColor = MaterialTheme.colorScheme.background.toArgb()
                 Surface(color = MaterialTheme.colorScheme.background) {
+                    val configuration = LocalConfiguration.current
+                    val isLandscape =
+                        configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
                     Column(
-                        modifier = Modifier.fillMaxSize(),
+                        modifier =
+                            Modifier.fillMaxSize().let {
+                                if (isLandscape) it.verticalScroll(rememberScrollState()) else it
+                            },
                         horizontalAlignment = Alignment.Start,
                         verticalArrangement = Arrangement.Top
                     ) {