1 files changed, 5 insertions, 3 deletions
diff --git a/src/platformsupport/fbconvenience/qfbwindow.cpp b/src/platformsupport/fbconvenience/qfbwindow.cpp
index 8b6186db79..b489ed351c 100644
--- a/src/platformsupport/fbconvenience/qfbwindow.cpp
+++ b/src/platformsupport/fbconvenience/qfbwindow.cpp
@@ -52,13 +52,10 @@ QFbWindow::QFbWindow(QWindow *window)
 {
     static QAtomicInt winIdGenerator(1);
     mWindowId = winIdGenerator.fetchAndAddRelaxed(1);
-
-    platformScreen()->addWindow(this);
 }
 
 QFbWindow::~QFbWindow()
 {
-    platformScreen()->removeWindow(this);
 }
 
 QFbScreen *QFbWindow::platformScreen() const
@@ -86,6 +83,11 @@ void QFbWindow::setVisible(bool visible)
             setGeometry(platformScreen()->availableGeometry());
     }
     QPlatformWindow::setVisible(visible);
+
+    if (visible)
+        platformScreen()->addWindow(this);
+    else
+        platformScreen()->removeWindow(this);
 }