diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index 005dd63b746..ade6f252664 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -50,6 +50,7 @@
             android:singleLine="true"
             android:textStyle="bold"
             android:inputType="textPassword"
+            android:imeOptions="actionNext"
             android:gravity="center"
             android:layout_gravity="center"
             android:textSize="24sp"
@@ -58,7 +59,6 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:background="@drawable/password_field_default"
             android:textColor="#ffffffff"
-            android:imeOptions="actionNext|flagNoEnterAction"
         />
     </LinearLayout>
 
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index e5580eb3148..a9b5640a4be 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -51,6 +51,7 @@
             android:singleLine="true"
             android:textStyle="bold"
             android:inputType="textPassword"
+            android:imeOptions="actionNext"
             android:gravity="center"
             android:layout_gravity="center"
             android:textSize="24sp"
@@ -59,7 +60,6 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:background="@drawable/password_field_default"
             android:textColor="#ffffffff"
-            android:imeOptions="actionNext|flagNoEnterAction"
         />
     </LinearLayout>
 
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
index 95186728be3..389552905fb 100644
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ b/res/layout-sw600dp-land/choose_lock_password.xml
@@ -51,6 +51,7 @@
             android:singleLine="true"
             android:textStyle="bold"
             android:inputType="textPassword"
+            android:imeOptions="actionNext"
             android:gravity="center"
             android:layout_gravity="center"
             android:textSize="24sp"
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
index 3874f11db33..c4472dbdda6 100644
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ b/res/layout-sw600dp-land/confirm_lock_password.xml
@@ -52,6 +52,7 @@
             android:singleLine="true"
             android:textStyle="bold"
             android:inputType="textPassword"
+            android:imeOptions="actionNext"
             android:gravity="center"
             android:layout_gravity="center"
             android:textSize="24sp"
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
index c8a086629ce..df53f68b4a0 100644
--- a/res/layout-sw600dp/choose_lock_password.xml
+++ b/res/layout-sw600dp/choose_lock_password.xml
@@ -46,6 +46,7 @@
         android:singleLine="true"
         android:textStyle="bold"
         android:inputType="textPassword"
+        android:imeOptions="actionNext"
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="32sp"
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 5ffc5e7b2f4..722153dfac8 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -49,6 +49,7 @@
         android:singleLine="true"
         android:textStyle="bold"
         android:inputType="textPassword"
+        android:imeOptions="actionNext"
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="32sp"
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index cb817c50a04..e9794134ad6 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -45,6 +45,7 @@
         android:singleLine="true"
         android:textStyle="bold"
         android:inputType="textPassword"
+        android:imeOptions="actionNext"
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="24sp"
@@ -53,7 +54,6 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
-        android:imeOptions="actionNext|flagNoEnterAction"
     />
 
     <!-- Spacer between password entry and keyboard -->
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index 21eecc26e3e..c952139b9c5 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -49,6 +49,7 @@
         android:singleLine="true"
         android:textStyle="bold"
         android:inputType="textPassword"
+        android:imeOptions="actionNext"
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="24sp"
@@ -57,7 +58,6 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
-        android:imeOptions="actionNext|flagNoEnterAction"
     />
 
     <!-- Spacer between password entry and keyboard -->