diff --git a/retroarch.c b/retroarch.c
index a2d2d86674..5c002e4872 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2936,8 +2936,29 @@ static void check_grab_mouse_toggle(void)
    old_pressed = pressed;
 }
 
-static void check_flip(void)
+static void do_state_checks(void)
 {
+   rarch_check_block_hotkey();
+
+   check_screenshot();
+   check_mute();
+   check_volume();
+
+   check_turbo();
+
+   check_grab_mouse_toggle();
+
+#ifdef HAVE_OVERLAY
+   rarch_check_overlay();
+#endif
+
+#ifdef HAVE_NETPLAY
+   if (g_extern.netplay)
+   {
+      check_netplay_flip();
+      return;
+   }
+#endif
    check_pause();
    check_oneshot();
 
@@ -2964,30 +2985,6 @@ static void check_flip(void)
    check_reset();
 }
 
-static void do_state_checks(void)
-{
-   rarch_check_block_hotkey();
-
-   check_screenshot();
-   check_mute();
-   check_volume();
-
-   check_turbo();
-
-   check_grab_mouse_toggle();
-
-#ifdef HAVE_OVERLAY
-   rarch_check_overlay();
-#endif
-
-#ifdef HAVE_NETPLAY
-   if (g_extern.netplay)
-      check_netplay_flip();
-   else
-#endif
-      check_flip();
-}
-
 static void init_state(void)
 {
    g_extern.video_active = true;