diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 3d7d22959d..bc2d6e6a17 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -546,6 +546,9 @@ void QWindowPrivate::create(bool recursive, WId nativeHandle)
 
     QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceCreated);
     QGuiApplication::sendEvent(q, &e);
+
+    if (updateRequestPending)
+        platformWindow->requestUpdate();
 }
 
 void QWindowPrivate::clearFocusObject()
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 7c24bbaadd..9415908383 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -29,6 +29,7 @@
 #include <qrasterwindow.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformintegration.h>
+#include <qpa/qplatformwindow.h>
 #include <private/qguiapplication_p.h>
 #include <private/qhighdpiscaling_p.h>
 #include <QtGui/QPainter>
@@ -114,6 +115,7 @@ private slots:
     void cleanup();
     void testBlockingWindowShownAfterModalDialog();
     void generatedMouseMove();
+    void keepPendingUpdateRequests();
 
 private:
     QPoint m_availableTopLeft;
@@ -2451,6 +2453,27 @@ void tst_QWindow::generatedMouseMove()
     QVERIFY(w.mouseMovedCount == 5);
 }
 
+void tst_QWindow::keepPendingUpdateRequests()
+{
+    QRect geometry(m_availableTopLeft + QPoint(80, 80), m_testWindowSize);
+
+    Window window;
+    window.setGeometry(geometry);
+    window.show();
+    QCoreApplication::processEvents();
+    QTRY_VERIFY(window.isExposed());
+
+    window.requestUpdate();
+    window.close();
+    window.setVisible(true);
+
+    QPlatformWindow *platformWindow = window.handle();
+    QVERIFY(platformWindow);
+
+    QVERIFY(platformWindow->hasPendingUpdateRequest());
+    QTRY_VERIFY(!platformWindow->hasPendingUpdateRequest());
+}
+
 #include <tst_qwindow.moc>
 QTEST_MAIN(tst_QWindow)