diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt
index ccc9b87f4..a1628867c 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt
@@ -91,7 +91,8 @@ fun AppDetailsScreen(
     packageName: String,
     onNavigateUp: () -> Unit,
     onNavigateToAppDetails: (packageName: String) -> Unit,
-    viewModel: AppDetailsViewModel = hiltViewModel(key = packageName)
+    viewModel: AppDetailsViewModel = hiltViewModel(key = packageName),
+    forceSinglePane: Boolean = false
 ) {
     val context = LocalContext.current
 
@@ -139,7 +140,8 @@ fun AppDetailsScreen(
                         },
                         onTestingSubscriptionChange = { subscribe ->
                             viewModel.updateTestingProgramStatus(packageName, subscribe)
-                        }
+                        },
+                        forceSinglePane = forceSinglePane
                     )
                 }
             }
@@ -200,10 +202,16 @@ private fun ScreenContentApp(
     onUninstall: () -> Unit = {},
     onOpen: () -> Unit = {},
     onTestingSubscriptionChange: (subscribe: Boolean) -> Unit = {},
-    windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()
+    windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),
+    forceSinglePane: Boolean = false
 ) {
     val context = LocalContext.current
-    val scaffoldDirective = calculatePaneScaffoldDirective(windowAdaptiveInfo)
+    var scaffoldDirective = calculatePaneScaffoldDirective(windowAdaptiveInfo)
+
+    if (forceSinglePane) {
+        scaffoldDirective = scaffoldDirective.copy(maxHorizontalPartitions = 1)
+    }
+
     val scaffoldNavigator = rememberSupportingPaneScaffoldNavigator<Screen>(
         scaffoldDirective = scaffoldDirective,
         adaptStrategies = SupportingPaneScaffoldDefaults.adaptStrategies(
diff --git a/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt
index 6decba8be..7f389a8f1 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt
@@ -27,6 +27,8 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.Text
+import androidx.compose.material3.adaptive.WindowAdaptiveInfo
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.material3.adaptive.layout.AnimatedPane
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
 import androidx.compose.material3.adaptive.navigation.NavigableListDetailPaneScaffold
@@ -59,6 +61,7 @@ import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
+import androidx.window.core.layout.WindowSizeClass
 import coil3.compose.LocalAsyncImagePreviewHandler
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.gplayapi.data.models.App
@@ -102,7 +105,8 @@ private fun ScreenContent(
     onFetchSuggestions: (String) -> Unit = {},
     onSearch: (String) -> Unit = {},
     onFilter: (filter: SearchFilter) -> Unit = {},
-    isAnonymous: Boolean = true
+    isAnonymous: Boolean = true,
+    windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),
 ) {
     val textFieldState = rememberTextFieldState()
     val searchBarState = rememberSearchBarState()
@@ -244,6 +248,7 @@ private fun ScreenContent(
                         onNavigateUp = {
                             coroutineScope.launch { scaffoldNavigator.navigateBack() }
                         },
+                        forceSinglePane = true
                     )
                 }