diff --git a/src/frontend/KaizenQt.cpp b/src/frontend/KaizenQt.cpp
index 83c43977..829d24bf 100644
--- a/src/frontend/KaizenQt.cpp
+++ b/src/frontend/KaizenQt.cpp
@@ -57,6 +57,10 @@ void KaizenQt::LoadROM(const QString& fileName) noexcept {
   emuThread->core.LoadROM(fileName.toStdString());
 }
 
+void KaizenQt::closeEvent(QCloseEvent*) {
+  emuThread->Stop();
+}
+
 void KaizenQt::LoadTAS(const QString& fileName) noexcept {
   emuThread->core.LoadTAS(fileName.toStdString());
 }
diff --git a/src/frontend/KaizenQt.hpp b/src/frontend/KaizenQt.hpp
index 5646b021..21f1cdd7 100644
--- a/src/frontend/KaizenQt.hpp
+++ b/src/frontend/KaizenQt.hpp
@@ -33,6 +33,7 @@ public:
   void dragEnterEvent(QDragEnterEvent*) override;
   void keyPressEvent(QKeyEvent*) override;
   void keyReleaseEvent(QKeyEvent*) override;
+  void closeEvent(QCloseEvent*) override;
 private:
   void ConnectMainWindowSignalsToSlots() noexcept;
   std::unique_ptr<MainWindowController> mainWindow;