diff --git a/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt b/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt
index abcc2b8f..a05dc94a 100644
--- a/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt
@@ -88,7 +88,7 @@ class RepositoryFragment() : ScreenFragment() {
         }
 
         val content = view.findViewById<FrameLayout>(R.id.fragment_content)!!
-        val scroll = ScrollView(content.context)
+        val scroll = NestedScrollView(content.context)
         scroll.id = android.R.id.list
         scroll.isFillViewport = true
         content.addView(
diff --git a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
index da49f524..3ee766ae 100644
--- a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
@@ -45,7 +45,7 @@ class SettingsFragment : ScreenFragment() {
         toolbar.setTitle(R.string.settings)
 
         val content = view.findViewById<FrameLayout>(R.id.fragment_content)!!
-        val scroll = ScrollView(content.context)
+        val scroll = NestedScrollView(content.context)
         scroll.id = R.id.preferences_list
         scroll.isFillViewport = true
         content.addView(
@@ -238,7 +238,7 @@ class SettingsFragment : ScreenFragment() {
         stringToValue: (String) -> T?, configureEdit: (EditText) -> Unit
     ) {
         addPreference(key, title, { valueToString(Preferences[key]) }) { it ->
-            val scroll = ScrollView(it)
+            val scroll = NestedScrollView(it)
             scroll.resources.sizeScaled(20).let { scroll.setPadding(it, 0, it, 0) }
             val edit = EditText(it)
             configureEdit(edit)
diff --git a/src/main/res/layout/edit_repository.xml b/src/main/res/layout/edit_repository.xml
index 44537b99..51257793 100644
--- a/src/main/res/layout/edit_repository.xml
+++ b/src/main/res/layout/edit_repository.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:animateLayoutChanges="true">
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -88,7 +88,7 @@
 
         </LinearLayout>
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <LinearLayout
         android:id="@+id/overlay"