diff --git a/src/kits/game/WindowScreen.cpp b/src/kits/game/WindowScreen.cpp
index 763fcf3d85..13daa3d267 100644
--- a/src/kits/game/WindowScreen.cpp
+++ b/src/kits/game/WindowScreen.cpp
@@ -727,15 +727,16 @@ BWindowScreen::_Deactivate()
 	} else
 		ScreenConnected(false);
 
+	if (fActivateState) {
+		BScreen screen(this);
+		SetColorList((rgb_color *)screen.ColorMap()->color_list);
+	}
+	
 	_AssertDisplayMode(fOriginalDisplayMode);
 
 	_ResetAccelerantHooks();
 	
 	be_app->ShowCursor();
-	if (fActivateState) {
-		BScreen screen(this);
-		SetColorList((rgb_color *)screen.ColorMap()->color_list);
-	}
 
 	return B_OK;
 }