diff --git a/driver.c b/driver.c
index 2e4ebcda3d..d4f3cf808d 100644
--- a/driver.c
+++ b/driver.c
@@ -361,8 +361,8 @@ void init_drivers(void)
 
    adjust_system_rates();
 
-   // adjust timers first before resetting frame count
-   for (unsigned i = 0; i < sizeof(g_extern.delay_timer) / sizeof(g_extern.delay_timer[0]); i++)
+   // Readjust timers first before resetting frame count.
+   for (unsigned i = 0; i < ARRAY_SIZE(g_extern.delay_timer); i++)
    {
       if (g_extern.delay_timer[i] > g_extern.frame_count)
          g_extern.delay_timer[i] -= g_extern.frame_count;
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index 15f6d7f8f2..e3b65f204a 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -886,12 +886,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
 #ifndef RARCH_PERFORMANCE_MODE
       case RGUI_SETTINGS_TOGGLE_FULLSCREEN:
          if (action == RGUI_ACTION_OK)
-         {
             rarch_set_fullscreen(!g_settings.video.fullscreen);
-            // Delay timers have been reset.
-            g_extern.delay_timer[0] = 15;
-            g_extern.delay_timer[1] = 15;
-         }
          break;
 #endif
       case RGUI_SETTINGS_VIDEO_ROTATION: