diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp
index 5a0dec6f4..7b07d2f48 100644
--- a/src/core/cheats.cpp
+++ b/src/core/cheats.cpp
@@ -771,7 +771,8 @@ bool CheatList::LoadFromPackage(const std::string& game_code)
       if (start == end)
         continue;
 
-      if (start[0] == ':' && !m_codes.empty())
+      // stop adding codes when we hit a different game
+      if (start[0] == ':' && (!m_codes.empty() || current_code.Valid()))
         break;
 
       if (start[0] == '#')