diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 522615ce6e..04bcc2b79e 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -3824,12 +3824,10 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
          else if (action == MENU_ACTION_RIGHT)
             g_extern.state_slot++;
          break;
-#ifdef HAVE_SCREENSHOTS
       case MENU_SETTINGS_SCREENSHOT:
          if (action == MENU_ACTION_OK)
-            rarch_take_screenshot();
+            rarch_main_command(RARCH_CMD_TAKE_SCREENSHOT);
          break;
-#endif
       case MENU_SETTINGS_RESTART_GAME:
          if (action == MENU_ACTION_OK)
          {
diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c
index 62c1e60225..75751a5523 100644
--- a/frontend/menu/backend/menu_lakka_backend.c
+++ b/frontend/menu/backend/menu_lakka_backend.c
@@ -368,7 +368,7 @@ static int menu_lakka_iterate(unsigned action)
                   return -1;
                   break;
                case 3:
-                  rarch_take_screenshot();
+                  rarch_main_command(RARCH_CMD_TAKE_SCREENSHOT);
                   break;
                case 4:
                   global_alpha = 0.0;
diff --git a/general.h b/general.h
index f09d81be59..768ac78b50 100644
--- a/general.h
+++ b/general.h
@@ -93,6 +93,7 @@ enum basic_event
    RARCH_CMD_LOAD_CONTENT,
    RARCH_CMD_LOAD_STATE,
    RARCH_CMD_SAVE_STATE,
+   RARCH_CMD_TAKE_SCREENSHOT,
    RARCH_CMD_QUIT,
 };
 
diff --git a/retroarch.c b/retroarch.c
index d34c5b0c6a..8811008888 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -78,7 +78,6 @@ static void check_fast_forward_button(void)
    old_hold_button_state = new_hold_button_state;
 }
 
-#if defined(HAVE_SCREENSHOTS) && !defined(_XBOX1)
 static bool take_screenshot_viewport(void)
 {
    struct rarch_viewport vp = {0};
@@ -192,7 +191,6 @@ void rarch_take_screenshot(void)
    else
       msg_queue_push(g_extern.msg_queue, msg, 1, 180);
 }
-#endif
 
 static void readjust_audio_input_rate(void)
 {
@@ -2601,7 +2599,6 @@ static void check_disk(void)
    old_pressed_next  = pressed_next;
 }
 
-#if defined(HAVE_SCREENSHOTS) && !defined(_XBOX)
 static void check_screenshot(void)
 {
    static bool old_pressed;
@@ -2611,7 +2608,6 @@ static void check_screenshot(void)
 
    old_pressed = pressed;
 }
-#endif
 
 static void check_mute(void)
 {
@@ -2742,9 +2738,7 @@ static void do_state_checks(void)
 {
    rarch_check_block_hotkey();
 
-#if defined(HAVE_SCREENSHOTS) && !defined(_XBOX)
    check_screenshot();
-#endif
    check_mute();
    check_volume();
 
@@ -3103,6 +3097,9 @@ void rarch_main_command(unsigned action)
       case RARCH_CMD_SAVE_STATE:
          rarch_save_state();
          break;
+      case RARCH_CMD_TAKE_SCREENSHOT:
+         rarch_take_screenshot();
+         break;
       case RARCH_CMD_QUIT:
          g_extern.system.shutdown = true;
          break;