diff --git a/android_app/app/src/main/res/layout/fragment_bluetoothsettings.xml b/android_app/app/src/main/res/layout/fragment_bluetoothsettings.xml
index d3113dbb..abf81fac 100644
--- a/android_app/app/src/main/res/layout/fragment_bluetoothsettings.xml
+++ b/android_app/app/src/main/res/layout/fragment_bluetoothsettings.xml
@@ -23,10 +23,16 @@
         android:layout_margin="20px"
         android:visibility="gone" />
 
-    <LinearLayout
-        android:id="@+id/deviceListView"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="10px"
-        android:orientation="vertical" />
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/deviceListView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10px"
+            android:orientation="vertical" />
+    </ScrollView>
+
 </LinearLayout>