diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9ec608f99..9bdf6f29c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,7 +47,7 @@
         <activity
             android:name="com.kunzisoft.keepass.activities.PasswordActivity"
             android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize|stateUnchanged">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml
index 0839a870c..29d98df89 100644
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -27,43 +27,11 @@
     android:backgroundTint="?android:attr/textColor"
     tools:targetApi="o">
 
-    <com.kunzisoft.keepass.view.SpecialModeView
-        android:id="@+id/special_mode_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="?attr/specialToolbarAppearance"
-        app:titleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title"
-        app:subtitleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
-        android:background="?attr/colorPrimary"
-        android:theme="?attr/toolbarAppearance"
-        android:popupTheme="?attr/toolbarPopupAppearance"
-        app:layout_collapseMode="pin"
-        tools:targetApi="lollipop">
-        <TextView
-            android:id="@+id/filename"
-            style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:ellipsize="marquee"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:scrollHorizontally="true"
-            android:singleLine="true"/>
-    </androidx.appcompat.widget.Toolbar>
-
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/activity_password_coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/activity_password_info_container">
 
         <FrameLayout
@@ -87,16 +55,50 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?android:attr/windowBackground">
+                android:layout_height="wrap_content">
+
+                <com.kunzisoft.keepass.view.SpecialModeView
+                    android:id="@+id/special_mode_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:theme="?attr/specialToolbarAppearance"
+                    app:titleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title"
+                    app:subtitleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
+                    android:background="?attr/colorPrimary"
+                    android:theme="?attr/toolbarAppearance"
+                    android:popupTheme="?attr/toolbarPopupAppearance"
+                    app:layout_collapseMode="pin"
+                    tools:targetApi="lollipop">
+                    <TextView
+                        android:id="@+id/filename"
+                        style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:ellipsize="marquee"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"/>
+                </androidx.appcompat.widget.Toolbar>
+
                 <LinearLayout
                     android:id="@+id/unlock_container"
                     android:orientation="vertical"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:elevation="4dp"
                     android:padding="@dimen/default_margin"
+                    android:background="?android:attr/windowBackground"
                     app:layout_constraintWidth_percent="@dimen/content_percent"
-                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/toolbar"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent">
 
@@ -172,6 +174,12 @@
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    app:layout_constraintTop_toBottomOf="@+id/unlock_container"
+                    android:background="?attr/colorBackgroundFloating" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.core.widget.NestedScrollView>