diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7b6a3e9e..ee4755e9 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,2 +1 @@
--keep class org.fossify.keyboard.helpers.MyKeyboard { *; }
 -keep class org.fossify.keyboard.helpers.MyKeyboard$Key { *; }
diff --git a/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
index de884a3b..698440c1 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
@@ -86,7 +86,7 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
             setKeyboardHolder(binding)
             setKeyboard(keyboard!!)
             setEditorInfo(currentInputEditorInfo)
-            setupNavigationBarPadding()
+            setupEdgeToEdge()
             mOnKeyboardActionListener = this@SimpleKeyboardIME
         }
 
@@ -553,13 +553,13 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
         }
     }
 
-    private fun setupNavigationBarPadding() {
+    private fun setupEdgeToEdge() {
         window.window?.apply {
-            WindowCompat.setDecorFitsSystemWindows(this, false)
+            WindowCompat.enableEdgeToEdge(this)
             ViewCompat.setOnApplyWindowInsetsListener(binding.keyboardHolder) { view, insets ->
                 val bottomPadding = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom
                 binding.keyboardHolder.updatePadding(bottom = bottomPadding)
-                ViewCompat.onApplyWindowInsets(view, insets)
+                insets
             }
         }
     }