diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 453a267fc..13d94d58a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,7 +60,8 @@
             android:launchMode="singleInstance"
             android:label="@string/menu_about" />
         <activity android:name="com.keepassdroid.password.PasswordActivity"
-            android:configChanges="orientation|keyboardHidden">
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/app/src/main/res/layout/password.xml b/app/src/main/res/layout/password.xml
index ff9ecf4ae..a1b36c1d0 100644
--- a/app/src/main/res/layout/password.xml
+++ b/app/src/main/res/layout/password.xml
@@ -22,9 +22,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/default_margin"
-    android:clipToPadding="false">
+    android:layout_height="match_parent">
 
     <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -130,6 +128,7 @@
                             android:layout_height="wrap_content"
                             android:hint="@string/password"
                             android:inputType="textPassword"
+                            android:imeOptions="actionDone"
                             android:maxLines="1"/>
                     </android.support.design.widget.TextInputLayout>
                 </RelativeLayout>