diff --git a/CHANGES b/CHANGES
index dd7c9d77f..74299681b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ Bugfixes:
  - ARM7: Fix STRT/STRBT
  - ARM7: Implement undefined STRH/LDRH/LDRSH/LDRSB versions
  - ARM7: Fix bank switching with LDR[B]T/STR[B]T
+ - Qt: Fix crash when closing multiplayer windows
 Misc:
  - Qt: Window size command line options are now supported
  - Qt: Increase usability of key mapper
diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp
index 85bf49b1c..023ad7568 100644
--- a/src/platform/qt/InputController.cpp
+++ b/src/platform/qt/InputController.cpp
@@ -91,8 +91,7 @@ void InputController::setConfiguration(ConfigController* config) {
 #ifdef BUILD_SDL
 	GBASDLEventsLoadConfig(&s_sdlEvents, config->input());
 	if (!m_playerAttached) {
-		GBASDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer);
-		m_playerAttached = true;
+		m_playerAttached = GBASDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer);
 	}
 	loadConfiguration(SDL_BINDING_BUTTON);
 	loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON));