diff --git a/CHANGES b/CHANGES
index 0072e33c2..35422cef7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@ Other fixes:
  - CMake: Fix .deb imagemagick dependencies
  - Qt: Fix crash in sprite viewer magnification (fixes mgba.io/i/1362)
  - 3DS: Ensure core 2 can be used for threaded renderer (fixes mgba.io/i/1371)
+ - GB Core: Fix toggling WIN and OBJ being swapped
 Misc:
  - GBA Savedata: EEPROM performance fixes
  - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash
diff --git a/src/gb/core.c b/src/gb/core.c
index 1671a1142..99f11029d 100644
--- a/src/gb/core.c
+++ b/src/gb/core.c
@@ -803,10 +803,10 @@ static void _GBCoreEnableVideoLayer(struct mCore* core, size_t id, bool enable)
 		gb->video.renderer->disableBG = !enable;
 		break;
 	case 1:
-		gb->video.renderer->disableOBJ = !enable;
+		gb->video.renderer->disableWIN = !enable;
 		break;
 	case 2:
-		gb->video.renderer->disableWIN = !enable;
+		gb->video.renderer->disableOBJ = !enable;
 		break;
 	default:
 		break;