diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 0df99d9f..195e9385 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -427,6 +427,7 @@ void QWaylandWindow::setVisible(bool visible)
     } else {
         sendExposeEvent(QRect());
         closePopups(this);
+        invalidateSurface();
         reset();
     }
 }
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
index 030422c5..a8eded3d 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
@@ -165,8 +165,6 @@ QSurfaceFormat QWaylandEglWindow::format() const
 void QWaylandEglWindow::setVisible(bool visible)
 {
     QWaylandWindow::setVisible(visible);
-    if (!visible)
-        invalidateSurface();
 }
 
 void QWaylandEglWindow::invalidateSurface()