diff --git a/CHANGES b/CHANGES
index 472521f00..6f7bd3d24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ Bugfixes:
  - Video: Fix an issue with very long filenames
  - GBA Video: Blended sprites should never have other effects applied
  - GBA: Fix crash if a 512kb flash save is loaded when a game has a 1Mb flash override
+ - Qt: Better cleanup when a game crashes
 Misc:
  - Qt: Handle saving input settings better
  - Debugger: Free watchpoints in addition to breakpoints
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 922736a46..0f1988666 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -366,6 +366,7 @@ void GameController::closeGame() {
 void GameController::crashGame(const QString& crashMessage) {
 	closeGame();
 	emit gameCrashed(crashMessage);
+	emit gameStopped(&m_threadContext);
 }
 
 bool GameController::isPaused() {