diff --git a/res/layout/autofill_settings_fragment.xml b/res/layout/autofill_settings_fragment.xml
index 8c90dd7..44bf8f0 100644
--- a/res/layout/autofill_settings_fragment.xml
+++ b/res/layout/autofill_settings_fragment.xml
@@ -62,7 +62,8 @@
                         android:layout_margin="2dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:inputType="textPersonName|textCapWords"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <TextView
@@ -79,7 +80,8 @@
                         android:layout_margin="2dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:inputType="textCapWords"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -107,7 +109,8 @@
                         android:layout_margin="2dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:inputType="textCapWords"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -135,7 +138,8 @@
                         android:layout_margin="2dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:inputType="textCapWords"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <TextView
@@ -152,7 +156,8 @@
                         android:layout_margin="2dip"
                         android:inputType="textCapWords"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <TextView
@@ -169,7 +174,8 @@
                         android:layout_margin="2dip"
                         android:inputType="textCapWords"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <TextView
@@ -186,7 +192,8 @@
                         android:layout_margin="2dip"
                         android:inputType="textCapCharacters"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <TextView
@@ -203,7 +210,8 @@
                         android:layout_margin="2dip"
                         android:inputType="textCapWords"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <TextView
@@ -220,7 +228,8 @@
                         android:layout_margin="2dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:singleLine="true"
-                        android:phoneNumber="true" />
+                        android:phoneNumber="true"
+                        android:imeOptions="actionNext" />
                 </TableRow>
                 <TableRow>
                     <TextView
@@ -237,7 +246,8 @@
                         android:layout_margin="2dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:inputType="textEmailAddress"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:imeOptions="actionDone" />
                 </TableRow>
             </TableLayout>
        </LinearLayout>