diff --git a/bauh/app.py b/bauh/app.py
index 734aa8b2..85eee62b 100755
--- a/bauh/app.py
+++ b/bauh/app.py
@@ -76,7 +76,7 @@ def main():
     manager.prepare()
 
     app = QApplication(sys.argv)
-    app.setQuitOnLastWindowClosed(False)
+    app.setQuitOnLastWindowClosed(False)   # otherwise windows opened through the tray icon kill the aplication when closed
     app.setApplicationName(__app_name__)
     app.setApplicationVersion(__version__)
     app_icon = util.get_default_icon()[1]
diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py
index 3da039dc..fe1b69ae 100755
--- a/bauh/view/qt/window.py
+++ b/bauh/view/qt/window.py
@@ -3,7 +3,7 @@ import time
 from pathlib import Path
 from typing import List, Type, Set
 
-from PyQt5.QtCore import QEvent, Qt, QSize, pyqtSignal
+from PyQt5.QtCore import QEvent, Qt, QSize, pyqtSignal, QCoreApplication
 from PyQt5.QtGui import QIcon, QWindowStateChangeEvent
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QCheckBox, QHeaderView, QToolBar, \
     QLabel, QPlainTextEdit, QLineEdit, QProgressBar, QPushButton, QComboBox, QApplication, QListView, QSizePolicy
@@ -504,6 +504,8 @@ class ManageWindow(QWidget):
             event.ignore()
             self.hide()
             self._handle_console_option(False)
+        else:
+            QCoreApplication.exit()  # needed because QuitOnLastWindowClosed is disabled
 
     def _handle_console(self, checked: bool):