diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp
index 62f2336f2..387498460 100644
--- a/src/frontend-common/fullscreen_ui.cpp
+++ b/src/frontend-common/fullscreen_ui.cpp
@@ -614,6 +614,7 @@ static void DoCheatsMenu()
     if (!s_host_interface->LoadCheatListFromDatabase() || !(cl = System::GetCheatList()))
     {
       s_host_interface->AddFormattedOSDMessage(10.0f, "No cheats found for %s.", System::GetRunningTitle().c_str());
+      ReturnToMainWindow();
       return;
     }
   }