diff --git a/app/build.gradle b/app/build.gradle
index 02361724..3820f4a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         compileSdk 35
         minSdkVersion 19
         targetSdkVersion 35
-        versionCode 106
-        versionName "5.20"
+        versionCode 107
+        versionName "5.21"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/KeyboardView.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/KeyboardView.java
index 9ec9185d..84217c0b 100644
--- a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/KeyboardView.java
+++ b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/KeyboardView.java
@@ -94,7 +94,9 @@ public class KeyboardView extends View {
     private final Rect mKeyBackgroundPadding = new Rect();
     private static final float KET_TEXT_SHADOW_RADIUS_DISABLED = -1.0f;
     public int mCustomColor = 0;
-    private int mSystemBarHeight = 0;
+    // Must be static to persist last known navbar height between View recreations
+    // as setOnApplyWindowInsetsListener is only invoked on layout changes
+    private static int mSystemBarHeight = 0;
 
     // The maximum key label width in the proportion to the key width.
     private static final float MAX_LABEL_RATIO = 0.90f;