diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index aad644f91..ccbe190a5 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -1256,6 +1256,19 @@ bool EventHandler::eventStateChange(Event::Type type)
         handled = false;
       break;
 
+    case Event::LauncherMode:
+      if (myState == EventHandlerState::PAUSE ||
+          myState == EventHandlerState::TIMEMACHINE)
+        setEventState(EventHandlerState::EMULATION);
+      else if(myState == EventHandlerState::CMDMENU)
+        leaveMenuMode();
+      // TODO: this currently does not work, because it exits all open dialogs too
+      /*else if(myState == EventHandlerState::DEBUGGER)
+        leaveDebugMode();*/
+      else
+        handled = false;
+      break;
+
     default:
       handled = false;
   }
diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx
index 0564c5d2e..05ffa3ba8 100644
--- a/src/emucore/EventHandler.hxx
+++ b/src/emucore/EventHandler.hxx
@@ -473,7 +473,6 @@ class EventHandler
       The following methods take care of assigning action mappings.
     */
     void setActionMappings(EventMode mode);
-    void setKeyNames();
     void setKeymap();
     void setDefaultKeymap(Event::Type, EventMode mode);
     void setDefaultJoymap(Event::Type, EventMode mode);