diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 660e3d2e6..6f92ccf7b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -145,7 +145,7 @@
             android:configChanges="keyboardHidden" />
         <activity
             android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustResize" />
         <!-- About and Settings -->
         <activity
             android:name="com.kunzisoft.keepass.activities.AboutActivity"
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index 84809e785..1ea3317b2 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -179,7 +179,7 @@ class EntryEditActivity : DatabaseLockActivity(),
 
         // To apply fit window with transparency
         setTransparentNavigationBar(applyToStatusBar = true) {
-            container?.applyWindowInsets(WindowInsetPosition.TOP)
+            container?.applyWindowInsets(WindowInsetPosition.TOP_BOTTOM_IME)
             footer?.applyWindowInsets(WindowInsetPosition.BOTTOM)
         }
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt b/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
index 6f2413121..c7b2fdfe3 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
@@ -350,9 +350,19 @@ fun View.applyWindowInsets(position: WindowInsetPosition = WindowInsetPosition.B
                 }
             }
             WindowInsetPosition.BOTTOM -> {
+                val imeHeight = windowInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom
                 if (view.layoutParams is ViewGroup.MarginLayoutParams) {
                     view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                        bottomMargin = insets.bottom
+                        bottomMargin = if (imeHeight > 1) 0 else insets.bottom
+                    }
+                }
+            }
+            WindowInsetPosition.TOP_BOTTOM_IME -> {
+                val imeHeight = windowInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom
+                if (view.layoutParams is ViewGroup.MarginLayoutParams) {
+                    view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                        topMargin = insets.top
+                        bottomMargin = if (imeHeight > 1) imeHeight else 0
                     }
                 }
             }
@@ -363,5 +373,5 @@ fun View.applyWindowInsets(position: WindowInsetPosition = WindowInsetPosition.B
 }
 
 enum class WindowInsetPosition {
-    TOP, BOTTOM, LEGIT_TOP
+    TOP, BOTTOM, LEGIT_TOP, TOP_BOTTOM_IME
 }
diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml
index d2bf00171..3ba3b8967 100644
--- a/app/src/main/res/layout/activity_entry_edit.xml
+++ b/app/src/main/res/layout/activity_entry_edit.xml
@@ -22,59 +22,55 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:importantForAutofill="noExcludeDescendants"
+    android:id="@+id/activity_entry_edit_container"
     tools:targetApi="o"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true">
 
+    <com.kunzisoft.keepass.view.ToolbarSpecial
+        android:id="@+id/special_mode_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/entry_edit_coordinator_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
+        app:layout_constraintBottom_toBottomOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/activity_entry_edit_container"
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/entry_edit_scroll"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <com.kunzisoft.keepass.view.ToolbarSpecial
-                android:id="@+id/special_mode_view"
+            android:layout_height="match_parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:scrollbarStyle="insideOverlay"
+            android:scrollbars="none"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/entry_edit_scroll"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:scrollbarStyle="insideOverlay"
-                android:scrollbars="none"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
-                <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_height="match_parent"
+                android:paddingTop="@dimen/card_view_margin_vertical"
+                android:paddingBottom="128dp">
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/entry_edit_template_selector"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:paddingTop="@dimen/card_view_margin_vertical"
-                    android:paddingBottom="128dp">
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/entry_edit_template_selector"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:layout_constraintTop_toTopOf="parent" />
-                    <androidx.fragment.app.FragmentContainerView
-                        android:id="@+id/entry_edit_content"
-                        android:name="com.kunzisoft.keepass.activities.fragments.EntryEditFragment"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        app:layout_constraintWidth_percent="@dimen/content_percent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/entry_edit_template_selector"/>
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.core.widget.NestedScrollView>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="parent" />
+                <androidx.fragment.app.FragmentContainerView
+                    android:id="@+id/entry_edit_content"
+                    android:name="com.kunzisoft.keepass.activities.fragments.EntryEditFragment"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintWidth_percent="@dimen/content_percent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/entry_edit_template_selector"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -82,14 +78,14 @@
         android:id="@+id/activity_entry_edit_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner">
 
         <com.kunzisoft.keepass.view.ToolbarAction
             android:id="@+id/entry_edit_bottom_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/entry_edit_validate"
@@ -110,12 +106,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"/>
-
-        <include layout="@layout/view_screenshot_mode_banner" />
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <include layout="@layout/view_screenshot_mode_banner" />
+
     <ProgressBar
         android:id="@+id/loading"
         android:layout_width="wrap_content"