diff --git a/res/layout/modifier_key_picker_dialog.xml b/res/layout/modifier_key_picker_dialog.xml
index 6de3294c2b6..fd4d75e6125 100644
--- a/res/layout/modifier_key_picker_dialog.xml
+++ b/res/layout/modifier_key_picker_dialog.xml
@@ -14,94 +14,102 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-              android:id="@+id/modifier_key_fragment_container"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent" >
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:id="@+id/modifier_key_fragment_scroll_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:divider="?android:dividerHorizontal"
-                  android:showDividers="end" >
-        <TextView
-            android:id="@+id/modifier_key_picker_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dip"
-            android:layout_marginBottom="8dip"
-            android:layout_gravity="center_horizontal"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="?android:attr/textColorPrimary"
-            android:text="@string/modifier_keys_picker_title"/>
+    <LinearLayout
+        android:id="@+id/modifier_key_fragment_container"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
 
-        <TextView
-            android:id="@+id/modifier_key_picker_summary"
-            android:layout_width="wrap_content"
+        <LinearLayout android:orientation="vertical"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:divider="?android:dividerHorizontal"
+                      android:showDividers="end" >
+            <TextView
+                android:id="@+id/modifier_key_picker_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_gravity="center_horizontal"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textColor="?android:attr/textColorPrimary"
+                android:text="@string/modifier_keys_picker_title"/>
+
+            <TextView
+                android:id="@+id/modifier_key_picker_summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_gravity="center_horizontal"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary"/>
+        </LinearLayout>
+
+        <LinearLayout android:orientation="vertical"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:divider="?android:dividerHorizontal"
+                      android:showDividers="end">
+            <ListView
+                android:id="@+id/modifier_key_picker"
+                android:layout_width="wrap_content"
+                android:layout_height="352dp"
+                android:divider="@null"
+                android:dividerHeight="8dp"
+                android:padding="16dp"
+                android:listSelector="@drawable/modifier_key_lisetview_background"
+            />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dip"
-            android:layout_marginBottom="16dip"
-            android:layout_gravity="center_horizontal"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"/>
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp">
+
+            <Button
+                android:id="@+id/modifier_key_cancel_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:layout_marginStart="8dp"
+                android:layout_alignParentStart="true"
+                android:paddingVertical="14dp"
+                android:drawablePadding="9dp"
+                style="@style/ModifierKeyButtonCancel"
+                android:textColor="?android:attr/textColorPrimary"
+                android:text="@string/modifier_keys_cancel"/>
+
+            <Button
+                android:id="@+id/modifier_key_done_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:layout_marginEnd="8dp"
+                android:layout_alignParentEnd="true"
+                android:paddingVertical="14dp"
+                android:drawablePadding="9dp"
+                style="@style/ModifierKeyButtonDone"
+                android:textColor="?androidprv:attr/materialColorOnPrimary"
+                android:text="@string/modifier_keys_done"/>
+
+        </RelativeLayout>
     </LinearLayout>
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:divider="?android:dividerHorizontal"
-                  android:showDividers="end">
-        <ListView
-            android:id="@+id/modifier_key_picker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:divider="@null"
-            android:dividerHeight="8dp"
-            android:padding="16dip"
-            android:listSelector="@drawable/modifier_key_lisetview_background"
-        />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dip"
-        android:layout_marginEnd="8dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/modifier_key_cancel_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dip"
-            android:layout_marginBottom="6dip"
-            android:layout_marginStart="8dip"
-            android:layout_alignParentStart="true"
-            android:paddingVertical="14dp"
-            android:drawablePadding="9dp"
-            style="@style/ModifierKeyButtonCancel"
-            android:textColor="?android:attr/textColorPrimary"
-            android:text="@string/modifier_keys_cancel"/>
-
-        <Button
-            android:id="@+id/modifier_key_done_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dip"
-            android:layout_marginBottom="6dip"
-            android:layout_marginEnd="8dip"
-            android:layout_alignParentEnd="true"
-            android:paddingVertical="14dp"
-            android:drawablePadding="9dp"
-            style="@style/ModifierKeyButtonDone"
-            android:textColor="?androidprv:attr/materialColorOnPrimary"
-            android:text="@string/modifier_keys_done"/>
-
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/modifier_key_reset_dialog.xml b/res/layout/modifier_key_reset_dialog.xml
index 11712bf9960..784b608bbab 100644
--- a/res/layout/modifier_key_reset_dialog.xml
+++ b/res/layout/modifier_key_reset_dialog.xml
@@ -26,7 +26,6 @@
         android:layout_marginTop="24dip"
         android:layout_marginBottom="8dip"
         android:layout_gravity="center_horizontal"
-        android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="?android:attr/textColorPrimary"
         android:text="@string/modifier_keys_reset_title" />
@@ -39,7 +38,6 @@
         android:layout_marginBottom="16dip"
         android:layout_marginStart="32dip"
         android:layout_marginEnd="32dip"
-        android:gravity="center"
         android:layout_gravity="center_horizontal"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary"