diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 20f463cf0..ccba66d70 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -651,6 +651,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 	}
 	event->accept();
 	writeSettings();
+	QApplication::closeAllWindows();
 }
 
 DiveListView *MainWindow::dive_list()