diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp
index a95dd3a629..f984156705 100644
--- a/360/frontend-xdk/menu.cpp
+++ b/360/frontend-xdk/menu.cpp
@@ -1179,7 +1179,7 @@ bool rmenu_iterate(void)
    XInputGetState(0, &state);
 
 
-   if (!(g_extern.frame_count < g_extern.delay_timer))
+   if (!(g_extern.frame_count < g_extern.delay_timer[0]))
    {
       bool rmenu_enable = !((state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB) 
             && (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) && (g_extern.main_is_init));
@@ -1229,7 +1229,7 @@ deinit:
    // set a timer delay so that we don't instantly switch back to the menu when
    // press and holding L3 + R3 in the emulation loop (lasts for 30 frame ticks)
    if(!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
-      g_extern.delay_timer = g_extern.frame_count + 30;
+      g_extern.delay_timer[0] = g_extern.frame_count + 30;
 
    g_extern.console.rmenu.state.ingame_menu.enable = false;
    g_extern.draw_menu = false;
diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c
index 844b2e4eb6..0e5f8a181c 100644
--- a/console/rmenu/rmenu.c
+++ b/console/rmenu/rmenu.c
@@ -2322,10 +2322,10 @@ void rmenu_input_poll(void *data, void *state)
       if(!first_held)
       {
          first_held = true;
-         g_extern.delay_timer = g_extern.frame_count + 7;
+         g_extern.delay_timer[1] = g_extern.frame_count + 7;
       }
 
-      if(!(g_extern.frame_count < g_extern.delay_timer))
+      if(!(g_extern.frame_count < g_extern.delay_timer[1]))
       {
          first_held = false;
          rstate->input = input_state; //second input frame set as current frame
@@ -2344,7 +2344,7 @@ void rmenu_input_process(void *data, void *state)
    (void)data;
    rmenu_state_t *rstate = (rmenu_state_t*)state;
 
-   if (!(g_extern.frame_count < g_extern.delay_timer))
+   if (!(g_extern.frame_count < g_extern.delay_timer[0]))
    {
       bool rmenu_enable = (((rstate->old_state & (1ULL << RMENU_DEVICE_NAV_L3)) && (rstate->old_state & (1ULL << RMENU_DEVICE_NAV_R3)) && g_extern.main_is_init));
 
@@ -2506,7 +2506,7 @@ deinit:
    // set a timer delay so that we don't instantly switch back to the menu when
    // press and holding L3 + R3 in the emulation loop (lasts for 30 frame ticks)
    if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
-      g_extern.delay_timer = g_extern.frame_count + 30;
+      g_extern.delay_timer[0] = g_extern.frame_count + 30;
 
    if(g_extern.console.rmenu.state.ingame_menu.enable)
       menu_stack_pop();
diff --git a/frontend/frontend_gx.c b/frontend/frontend_gx.c
index 61f62dd513..359aac47b8 100644
--- a/frontend/frontend_gx.c
+++ b/frontend/frontend_gx.c
@@ -297,10 +297,10 @@ static bool rmenu_iterate(void)
       if(!first_held)
       {
          first_held = true;
-         g_extern.delay_timer = g_extern.frame_count + (initial_held ? 15 : 7);
+         g_extern.delay_timer[1] = g_extern.frame_count + (initial_held ? 15 : 7);
       }
 
-      if (!(g_extern.frame_count < g_extern.delay_timer))
+      if (!(g_extern.frame_count < g_extern.delay_timer[1]))
       {
          first_held = false;
          trigger_state = input_state; //second input frame set as current frame
@@ -340,7 +340,7 @@ static bool rmenu_iterate(void)
 
    old_input_state = input_state;
 
-   if (!(g_extern.frame_count < g_extern.delay_timer))
+   if (!(g_extern.frame_count < g_extern.delay_timer[0]))
    {
       bool rmenu_enable = ((trigger_state & (1ULL << GX_DEVICE_NAV_MENU)) && g_extern.main_is_init);
       bool quit_key_pressed = (trigger_state & (1ULL << GX_DEVICE_NAV_QUIT));
@@ -366,7 +366,7 @@ deinit:
    // set a timer delay so that we don't instantly switch back to the menu when
    // press and holding QUIT in the emulation loop (lasts for 30 frame ticks)
    if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
-      g_extern.delay_timer = g_extern.frame_count + 30;
+      g_extern.delay_timer[0] = g_extern.frame_count + 30;
 
    g_extern.draw_menu = false;
    g_extern.console.rmenu.state.ingame_menu.enable = false;
diff --git a/general.h b/general.h
index 1bbd27d959..9d9f3ac9a9 100644
--- a/general.h
+++ b/general.h
@@ -454,7 +454,8 @@ struct global
    } frame_cache;
 
    unsigned frame_count;
-   unsigned delay_timer;
+   // two timers, the first for handling menu and exit button delays, the second for scrolling delays
+   unsigned delay_timer[2];
    char title_buf[64];
 
    struct
diff --git a/gx/gx_input.c b/gx/gx_input.c
index c8ae4df33e..2e74c54daa 100644
--- a/gx/gx_input.c
+++ b/gx/gx_input.c
@@ -449,7 +449,7 @@ static void gx_input_poll(void *data)
       g_quit = false;
    }
 
-   if (!(g_extern.frame_count < g_extern.delay_timer))
+   if (!(g_extern.frame_count < g_extern.delay_timer[0]))
    {
       if (*pad_p1 & GX_QUIT_KEY)
          *lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c
index 4a6610d72b..33d0012442 100644
--- a/ps3/ps3_input.c
+++ b/ps3/ps3_input.c
@@ -207,7 +207,7 @@ static void ps3_input_poll(void *data)
    if ((*state_p1 & (1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_UP)) && !(*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R2)))
       *lifecycle_state |= (1ULL << RARCH_REWIND);
 
-   if (!(g_extern.frame_count < g_extern.delay_timer))
+   if (!(g_extern.frame_count < g_extern.delay_timer[0]))
    {
       if((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
       {
diff --git a/retroarch.c b/retroarch.c
index 57057e15e4..c48418709b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2789,7 +2789,7 @@ bool rarch_main_iterate(void)
       if (rmenu_enable || (g_extern.console.rmenu.state.ingame_menu.enable && !rmenu_enable))
       {
          g_extern.console.rmenu.mode = MODE_MENU;
-         g_extern.delay_timer = g_extern.frame_count + 30;
+         g_extern.delay_timer[0] = g_extern.frame_count + 30;
       }
 #endif
       return false;
diff --git a/xdk/xdk_xinput_input.c b/xdk/xdk_xinput_input.c
index 41a5c86bf5..e81646eb01 100644
--- a/xdk/xdk_xinput_input.c
+++ b/xdk/xdk_xinput_input.c
@@ -223,7 +223,7 @@ static void xdk_input_poll(void *data)
    if ((*state_p1 & (1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_UP)) && !(*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R2)))
       *lifecycle_state |= (1ULL << RARCH_REWIND);
 
-   if (!(g_extern.frame_count < g_extern.delay_timer))
+   if (!(g_extern.frame_count < g_extern.delay_timer[0]))
    {
       if((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
       {