diff --git a/client/ui/mainwindow.cpp b/client/ui/mainwindow.cpp
index 27ce90ef..ecdac7a9 100644
--- a/client/ui/mainwindow.cpp
+++ b/client/ui/mainwindow.cpp
@@ -219,8 +219,11 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 
 void MainWindow::closeEvent(QCloseEvent *event)
 {
-    event->ignore();
-    hide();
+    if (currentPage() == Page::Start || currentPage() == Page::NewServer) qApp->quit();
+    else {
+        hide();
+        event->ignore();
+    }
 }
 
 void MainWindow::showEvent(QShowEvent *event)