diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt
index c1b02738..1f6f4c51 100644
--- a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt
+++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt
@@ -17,17 +17,11 @@ import androidx.appcompat.app.AppCompatActivity
 
 @JvmOverloads
 @Suppress("MagicNumber")
-fun AppCompatActivity.adjustUIForAPILevel35(
+fun AppCompatActivity.applyEdgeToEdgeWithSystemBarPadding(
     statusBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
     navigationBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
 ) {
-    val isApiLevel35OrHigher = (Build.VERSION.SDK_INT >= 35)
-    if (!isApiLevel35OrHigher) {
-        return
-    }
-
     enableEdgeToEdge(statusBarStyle, navigationBarStyle)
-
     window.addSystemBarPaddings()
 }
 
diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/WindowExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/WindowExtensions.kt
index 492c4e0e..6f5c9e74 100644
--- a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/WindowExtensions.kt
+++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/WindowExtensions.kt
@@ -19,13 +19,15 @@ fun Window?.addSystemBarPaddings() {
     }
 
     ViewCompat.setOnApplyWindowInsetsListener(decorView) { v: View, insets: WindowInsetsCompat ->
-        val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+        val bottomInset = maxOf(systemBars.bottom, ime.bottom)
 
         v.updatePadding(
-            left = bars.left,
-            top = bars.top,
-            right = bars.right,
-            bottom = bars.bottom
+            left = systemBars.left,
+            top = systemBars.top,
+            right = systemBars.right,
+            bottom = bottomInset
         )
 
         WindowInsetsCompat.CONSUMED