diff --git a/app/src/main/res/layout/generate_password.xml b/app/src/main/res/layout/generate_password.xml
index 3a9865f2c..58062ba61 100644
--- a/app/src/main/res/layout/generate_password.xml
+++ b/app/src/main/res/layout/generate_password.xml
@@ -34,6 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ems="10"
+            android:maxLines="3"
             android:hint="@string/hint_generated_password" />
 
         <Button android:id="@+id/generate_password_button"
@@ -62,12 +63,13 @@
                     android:layout_width="match_parent" />
 
                 <EditText android:id="@+id/length"
-                    android:layout_width="60dp"
+                    android:layout_width="50dp"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/length_label"
                     android:maxLines="1"
+                    android:maxLength="3"
                     android:inputType="number"
                     android:text="@integer/default_password_length"
                     android:hint="@string/hint_length"/>