diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
index e1292eed87a..9f2f4eecd1c 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
@@ -396,6 +396,7 @@ class QtActivityDelegate extends QtActivityDelegateBase
         QtNative.runAction(()-> {
             if (m_topLevelWindows.containsKey(id)) {
                 QtWindow window = m_topLevelWindows.remove(id);
+                window.setOnApplyWindowInsetsListener(null); // Set in QtWindow for safe margins
                 if (m_topLevelWindows.isEmpty()) {
                    // Keep last frame in stack until it is replaced to get correct
                    // shutdown transition
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtWindow.java b/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
index cb7a6404e80..a9a7fa3f81b 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtWindow.java
@@ -32,7 +32,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
     private final QtInputConnection.QtInputConnectionListener m_inputConnectionListener;
 
     private static native void setSurface(int windowId, Surface surface);
-    private static native void safeAreaMarginsChanged(Insets insets);
+    private static native void safeAreaMarginsChanged(Insets insets, int id);
     static native void windowFocusChanged(boolean hasFocus, int id);
     static native void updateWindows();
 
@@ -77,8 +77,7 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
         });
 
         if (getContext() instanceof QtActivityBase) {
-            View decorView = ((Activity) context).getWindow().getDecorView();
-            decorView.setOnApplyWindowInsetsListener((view, insets) -> {
+            setOnApplyWindowInsetsListener((view, insets) -> {
                 Insets safeInsets;
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                     int types = WindowInsets.Type.displayCutout() | WindowInsets.Type.systemBars();
@@ -110,10 +109,12 @@ class QtWindow extends QtLayout implements QtSurfaceInterface {
                     safeInsets = Insets.of(left, top, right, bottom);
                 }
 
-                safeAreaMarginsChanged(safeInsets);
+                QtNative.runAction(() -> safeAreaMarginsChanged(safeInsets, getId()));
 
                 return insets;
             });
+
+            QtNative.runAction(() -> requestApplyInsets());
         }
     }
 
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp
index 51e5f95605f..b83b1df88f1 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp
@@ -383,7 +383,8 @@ void QAndroidPlatformWindow::windowFocusChanged(JNIEnv *env, jobject object,
     }
 }
 
-void QAndroidPlatformWindow::safeAreaMarginsChanged(JNIEnv *env, jobject object, QtJniTypes::Insets insets)
+void QAndroidPlatformWindow::safeAreaMarginsChanged(JNIEnv *env, jobject object,
+                                                    QtJniTypes::Insets insets, jint id)
 {
     Q_UNUSED(env)
     Q_UNUSED(object)
@@ -391,10 +392,6 @@ void QAndroidPlatformWindow::safeAreaMarginsChanged(JNIEnv *env, jobject object,
     if (!qGuiApp)
         return;
 
-    const auto tlw = qGuiApp->topLevelWindows();
-    if (tlw.isEmpty())
-        return;
-
     QMargins safeMargins;
     if (insets.isValid()) {
         safeMargins = QMargins(
@@ -404,17 +401,17 @@ void QAndroidPlatformWindow::safeAreaMarginsChanged(JNIEnv *env, jobject object,
             insets.getField<int>("bottom"));
     }
 
-    for (QWindow *window : qGuiApp->topLevelWindows()) {
+    for (QWindow *window : qGuiApp->allWindows()) {
         if (!window->handle())
             continue;
-
-        auto *pWindow = static_cast<QAndroidPlatformWindow *>(window->handle());
-        if (!pWindow)
-            return;
+        QAndroidPlatformWindow *pWindow = static_cast<QAndroidPlatformWindow *>(window->handle());
+        if (pWindow->nativeViewId() != id)
+            continue;
 
         if (safeMargins != pWindow->safeAreaMargins()) {
             pWindow->setSafeAreaMargins(safeMargins);
             QWindowSystemInterface::handleSafeAreaMarginsChanged(window);
+            break;
         }
     }
 }
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h
index 39010879608..504181406d0 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.h
+++ b/src/plugins/platforms/android/qandroidplatformwindow.h
@@ -108,7 +108,7 @@ private:
     Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(setSurface)
     static void windowFocusChanged(JNIEnv *env, jobject object, jboolean focus, jint windowId);
     Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(windowFocusChanged)
-    static void safeAreaMarginsChanged(JNIEnv *env, jobject obj, QtJniTypes::Insets insets);
+    static void safeAreaMarginsChanged(JNIEnv *env, jobject obj, QtJniTypes::Insets insets, jint  id);
     Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(safeAreaMarginsChanged)
 
     [[nodiscard]] QMutexLocker<QMutex> destructionGuard();