diff --git a/CHANGES b/CHANGES
index 88a8f099e..da97fa613 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Bugfixes:
  - Qt: Fix changing resolution of software renderer
  - Qt: Fix setting overrides
  - Qt: Fix cut off tiles and alignment issues in tile viewer
+ - GBA Cheats: Fix GameShark ROM patches
 
 0.5.1: (2016-10-05)
 Bugfixes:
diff --git a/src/gba/cheats/gameshark.c b/src/gba/cheats/gameshark.c
index 6a7b17fed..45de5c55d 100644
--- a/src/gba/cheats/gameshark.c
+++ b/src/gba/cheats/gameshark.c
@@ -145,7 +145,7 @@ bool GBACheatAddGameSharkRaw(struct GBACheatSet* cheats, uint32_t op1, uint32_t
 		cheats->incompleteCheat = mCheatListIndex(&cheats->d.list, cheat);
 		break;
 	case GSA_PATCH:
-		cheats->romPatches[0].address = (op1 & 0xFFFFFF) << 1;
+		cheats->romPatches[0].address = BASE_CART0 | ((op1 & 0xFFFFFF) << 1);
 		cheats->romPatches[0].newValue = op2;
 		cheats->romPatches[0].applied = false;
 		cheats->romPatches[0].exists = true;