diff --git a/libretro_version_1.c b/libretro_version_1.c
index 720510f21b..952f598a8a 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -191,7 +191,7 @@ static int16_t input_state(unsigned port, unsigned device,
          switch (device)
          {
             case RETRO_DEVICE_JOYPAD:
-               if (ol_state->buttons & (UINT64_C(1) << id))
+               if (ol_state && ol_state->buttons & (UINT64_C(1) << id))
                   res |= 1;
                break;
             case RETRO_DEVICE_KEYBOARD:
@@ -209,7 +209,7 @@ static int16_t input_state(unsigned port, unsigned device,
                      base = 2;
                   if (id == RETRO_DEVICE_ID_ANALOG_Y)
                      base += 1;
-                  if (ol_state->analog[base])
+                  if (ol_state && ol_state->analog[base])
                      res = ol_state->analog[base];
                }
                break;
diff --git a/runloop.c b/runloop.c
index 446a311e3e..dcf7acb32f 100644
--- a/runloop.c
+++ b/runloop.c
@@ -434,11 +434,19 @@ static void do_state_check_menu_toggle(void)
    if (menu_driver_alive())
    {
       if (global->main_is_init && (global->core_type != CORE_TYPE_DUMMY))
+      {
          rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
+#if 0
+         event_command(EVENT_CMD_OVERLAY_INIT);
+#endif
+      }
       return;
    }
 
    rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
+#if 0
+   event_command(EVENT_CMD_OVERLAY_DEINIT);
+#endif
 }
 #endif