diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
index ad78ea908..2b1fc6b36 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
@@ -791,11 +791,7 @@ fun VideoQualitySetting(
             }
         },
         popupContents = {
-            Column(
-                Modifier
-                    .selectableGroup()
-                    .verticalScroll(rememberScrollState())
-            ) {
+            Column(Modifier.selectableGroup()) {
                 SingleChoiceSelector(
                     modifier = Modifier.testTag(
                         getVideoQualityOptionTestTag(VideoQuality.UNSPECIFIED)
@@ -920,10 +916,18 @@ fun BasicPopupSetting(
             },
             title = { Text(text = title) },
             text = {
-                MaterialTheme(
-                    colorScheme = MaterialTheme.colorScheme.copy(surface = Color.Transparent),
-                    content = popupContents
-                )
+                // Apply a scroll state to ensure content is reachable
+                val scrollState = rememberScrollState()
+                Column(
+                    modifier = Modifier
+                        .testTag(CONTAINER_DIALOG_CONTENTS)
+                        .verticalScroll(scrollState)
+                ) {
+                    MaterialTheme(
+                        colorScheme = MaterialTheme.colorScheme.copy(surface = Color.Transparent),
+                        content = popupContents
+                    )
+                }
             }
         )
     }
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt
index 6d0d4b029..6f9fe1c6a 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt
@@ -28,6 +28,7 @@ package com.google.jetpackcamera.settings.ui
 const val SETTINGS_TITLE = "SettingsTitle"
 const val BACK_BUTTON = "BackButton"
 const val CLOSE_BUTTON = "CloseButton"
+const val CONTAINER_DIALOG_CONTENTS = "dialog_contents_container"
 
 // unsupported rationale tags
 const val DEVICE_UNSUPPORTED_TAG = "DeviceUnsupportedTag"