diff --git a/src/frontend/KaizenQt.cpp b/src/frontend/KaizenQt.cpp
index 7991bab7..eb2004a8 100644
--- a/src/frontend/KaizenQt.cpp
+++ b/src/frontend/KaizenQt.cpp
@@ -34,7 +34,6 @@ void KaizenQt::ConnectMainWindowSignalsToSlots() noexcept {
   connect(mainWindow.get(), &MainWindow::Exit, this, &KaizenQt::Quit);
   connect(mainWindow.get(), &MainWindow::Reset, emuThread.get(), &EmuThread::Reset);
   connect(mainWindow.get(), &MainWindow::Stop, emuThread.get(), &EmuThread::Stop);
-  connect(mainWindow.get(), &MainWindow::Stop, this, [this] { mainWindow->setWindowTitle("Kaizen"); });
   connect(mainWindow.get(), &MainWindow::Pause, emuThread.get(), &EmuThread::TogglePause);
 }
 
diff --git a/src/frontend/MainWindow.cpp b/src/frontend/MainWindow.cpp
index 4257a615..79cf3e59 100644
--- a/src/frontend/MainWindow.cpp
+++ b/src/frontend/MainWindow.cpp
@@ -120,6 +120,7 @@ void MainWindow::ConnectSignalsToSlots() noexcept {
   connect(actionReset.get(), &QAction::triggered, this, [this]() { emit Reset(); });
 
   connect(actionStop.get(), &QAction::triggered, this, [this]() {
+    setWindowTitle("Kaizen");
     vulkanWidget->hide();
     actionPause->setDisabled(true);
     actionReset->setDisabled(true);