diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 68e2c1f9c7..aea5651005 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -976,8 +976,10 @@ void MainWindow::closeEvent (QCloseEvent * e)
         }
 
         /*emit*/ mainWindowClosed();
-        if (this->property("QuitOnClosed").isValid())
+        if (this->property("QuitOnClosed").isValid()) {
+            QApplication::closeAllWindows();
             qApp->quit(); // stop the event loop
+        }
     }
 }