diff --git a/android-template/app/src/main/AndroidManifest.xml b/android-template/app/src/main/AndroidManifest.xml
index b06ddbfd8..79881d678 100644
--- a/android-template/app/src/main/AndroidManifest.xml
+++ b/android-template/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
             android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBarLaunch"
             android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize"
             android:exported="true">
 
             <intent-filter>
diff --git a/android/capacitor/src/main/java/com/getcapacitor/CapacitorWebView.java b/android/capacitor/src/main/java/com/getcapacitor/CapacitorWebView.java
index 07c9ec971..de9b3d13a 100644
--- a/android/capacitor/src/main/java/com/getcapacitor/CapacitorWebView.java
+++ b/android/capacitor/src/main/java/com/getcapacitor/CapacitorWebView.java
@@ -12,6 +12,8 @@
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+import android.view.ViewGroup.MarginLayoutParams;
+import android.os.Build;
 
 public class CapacitorWebView extends WebView {
 
@@ -25,6 +27,33 @@ public CapacitorWebView(Context context, AttributeSet attrs) {
     public void setBridge(Bridge bridge) {
         this.bridge = bridge;
     }
+    
+    /**
+     * Handle keyboard visibility changes to ensure input fields remain visible
+     */
+    private void handleKeyboardVisibility(boolean isVisible, int keyboardHeight) {
+        if (Build.VERSION.SDK_INT >= 34) {
+            post(() -> {
+                if (isVisible) {
+                    // Scroll to focused element when keyboard appears
+                    evaluateJavascript(
+                        "(function() {" +
+                        "  var focused = document.activeElement;" +
+                        "  if (focused && (focused.tagName === 'INPUT' || focused.tagName === 'TEXTAREA')) {" +
+                        "    var rect = focused.getBoundingClientRect();" +
+                        "    var viewportHeight = window.innerHeight;" +
+                        "    var keyboardHeight = " + keyboardHeight + ";" +
+                        "    if (rect.bottom > (viewportHeight - keyboardHeight)) {" +
+                        "      var scrollOffset = rect.bottom - (viewportHeight - keyboardHeight) + 20;" +
+                        "      window.scrollBy(0, scrollOffset);" +
+                        "    }" +
+                        "  }" +
+                        "})();", null
+                    );
+                }
+            });
+        }
+    }
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
@@ -63,25 +92,74 @@ public void edgeToEdgeHandler(Bridge bridge) {
         boolean autoMargins = false;
         boolean forceMargins = configEdgeToEdge.equals("force");
 
+        // Handle Android 15+ edge-to-edge enforcement
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && configEdgeToEdge.equals("auto")) {
             TypedValue value = new TypedValue();
             boolean foundOptOut = getContext().getTheme().resolveAttribute(android.R.attr.windowOptOutEdgeToEdgeEnforcement, value, true);
-            boolean optOutValue = value.data != 0; // value is set to -1 on true as of Android 15, so we have to do this.
-
+            boolean optOutValue = value.data != 0;
             autoMargins = !(foundOptOut && optOutValue);
         }
+        
+        // Force margins for Android 15+ when edge-to-edge is enabled
+        if (Build.VERSION.SDK_INT >= 34 && configEdgeToEdge.equals("force")) {
+            forceMargins = true;
+        }
 
         if (forceMargins || autoMargins) {
             ViewCompat.setOnApplyWindowInsetsListener(this, (v, windowInsets) -> {
-                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
-                MarginLayoutParams mlp = (MarginLayoutParams) v.getLayoutParams();
-                mlp.leftMargin = insets.left;
-                mlp.bottomMargin = insets.bottom;
-                mlp.rightMargin = insets.right;
-                mlp.topMargin = insets.top;
-                v.setLayoutParams(mlp);
+                Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
+                Insets imeInsets = windowInsets.getInsets(WindowInsetsCompat.Type.ime());
+                
+                // Android 15+ keyboard handling
+                if (Build.VERSION.SDK_INT >= 34) {
+                    MarginLayoutParams mlp = (MarginLayoutParams) v.getLayoutParams();
+                    
+                    // Apply system insets
+                    mlp.leftMargin = systemInsets.left;
+                    mlp.rightMargin = systemInsets.right;
+                    mlp.topMargin = systemInsets.top;
+                    
+                    // Handle keyboard visibility for Android 15+
+                    if (imeInsets.bottom > 0) {
+                        // Keyboard is visible - ensure input visibility
+                        handleKeyboardVisibility(true, imeInsets.bottom);
+                        if (bridge.getConfig().isInputCaptured()) {
+                            // Don't apply bottom margin to prevent scroll space
+                            mlp.bottomMargin = 0;
+                            // Adjust WebView height to account for keyboard
+                            setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), imeInsets.bottom);
+                        } else {
+                            mlp.bottomMargin = Math.max(systemInsets.bottom, imeInsets.bottom);
+                        }
+                    } else {
+                        // Keyboard hidden - restore normal margins
+                        handleKeyboardVisibility(false, 0);
+                        mlp.bottomMargin = systemInsets.bottom;
+                        setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), 0);
+                    }
+                    
+                    v.setLayoutParams(mlp);
+                } else {
+                    // Legacy handling for older Android versions
+                    MarginLayoutParams mlp = (MarginLayoutParams) v.getLayoutParams();
+                    mlp.leftMargin = systemInsets.left;
+                    mlp.rightMargin = systemInsets.right;
+                    mlp.topMargin = systemInsets.top;
+                    
+                    if (bridge.getConfig().isInputCaptured() && imeInsets.bottom > 0) {
+                        mlp.bottomMargin = 0;
+                    } else {
+                        mlp.bottomMargin = systemInsets.bottom;
+                    }
+                    
+                    v.setLayoutParams(mlp);
+                }
 
-                // Don't pass window insets to children
+                // Return appropriate insets based on Android version
+                if (Build.VERSION.SDK_INT >= 34 && imeInsets.bottom > 0) {
+                    // On Android 15+, let the system handle IME insets
+                    return windowInsets.inset(systemInsets);
+                }
                 return WindowInsetsCompat.CONSUMED;
             });
         }