diff --git a/CHANGES b/CHANGES
index 10b18f9ea..d5ba07ba6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ Bugfixes:
  - GB MBC: Fix SRAM dangling pointer with RTC games
  - Windows: Fix Unicode directory handling
  - Qt: Fix changing resolution of software renderer
+ - Qt: Fix setting overrides
 
 0.5.1: (2016-10-05)
 Bugfixes:
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index a96782365..c3d54bd51 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -129,6 +129,11 @@ GameController::GameController(QObject* parent)
 		}
 		controller->m_fpsTarget = context->sync.fpsTarget;
 
+		if (controller->m_override) {
+			controller->m_override->identify(context->core);
+			controller->m_override->apply(context->core);
+		}
+
 		if (mCoreLoadState(context->core, 0, controller->m_loadStateFlags)) {
 			mCoreDeleteState(context->core, 0);
 		}
@@ -445,11 +450,6 @@ void GameController::openGame(bool biosOnly) {
 	}
 	m_vf = nullptr;
 
-	if (m_override) {
-		m_override->identify(m_threadContext.core);
-		m_override->apply(m_threadContext.core);
-	}
-
 	if (!mCoreThreadStart(&m_threadContext)) {
 		emit gameFailed();
 	}