diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f523ecb..5b4ddce 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -18,6 +18,7 @@
 #include <QTimer>
 #include <QEvent>
 #include <QKeyEvent>
+#include <QCloseEvent>
 #include <QItemSelectionModel>
 #include <iostream>
 
@@ -293,3 +294,15 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 
     QMainWindow::keyPressEvent(event);
 }
+
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    if (m_stack->currentWidget() == m_imageView)
+    {
+        leaveSingleImageMode();
+        event->ignore();
+        return;
+    }
+
+    QMainWindow::closeEvent(event);
+}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7ba78f9..f30382c 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -28,6 +28,7 @@ private:
 
     void keyPressEvent(QKeyEvent *event) override;
     bool eventFilter(QObject *obj, QEvent *event) override;
+    void closeEvent(QCloseEvent *event) override;
 
     QFileSystemModel *m_dirModel;
     ImageModel *m_imageModel;