diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp
index 0d9faf3fee..596e8070d8 100644
--- a/360/frontend-xdk/menu.cpp
+++ b/360/frontend-xdk/menu.cpp
@@ -1202,7 +1202,7 @@ void menu_loop(void)
       hr = app.Render();   /* Render XUI */
       hr = XuiTimersRun(); /* Update XUI timers */
 
-      if(g_extern.console.rmenu.mode == MODE_EMULATION && !g_extern.console.screen.state.frame_advance.enable)
+      if(g_extern.console.rmenu.mode == MODE_EMULATION && !(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
       {
          SET_TIMER_EXPIRATION(device_ptr, 0, 30);
       }
diff --git a/console/rarch_console_settings.c b/console/rarch_console_settings.c
index 428c1afd6a..b4f7253660 100644
--- a/console/rarch_console_settings.c
+++ b/console/rarch_console_settings.c
@@ -51,7 +51,7 @@ void rarch_settings_change(unsigned setting)
          g_settings.audio.rate_control = true;
          break;
       case S_FRAME_ADVANCE:
-         g_extern.console.screen.state.frame_advance.enable = true;
+         g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
          g_extern.console.rmenu.state.rmenu.enable = false;
          g_extern.console.rmenu.mode = MODE_EMULATION;
          break;
@@ -98,7 +98,6 @@ void rarch_settings_change(unsigned setting)
          g_extern.console.rmenu.mode = MODE_EXIT;
          break;
       case S_RETURN_TO_GAME:
-         g_extern.console.screen.state.frame_advance.enable = false;
          g_extern.console.rmenu.state.rmenu.enable = false;
          g_extern.console.rmenu.mode = MODE_EMULATION;
          break;
@@ -394,7 +393,6 @@ void rarch_settings_set_default(void)
    strlcpy(g_extern.console.main_wrap.paths.default_savestate_dir, default_paths.savestate_dir, sizeof(g_extern.console.main_wrap.paths.default_savestate_dir));
    g_settings.video.aspect_ratio_idx = 0;
    g_extern.console.block_config_read = true;
-   g_extern.console.screen.state.frame_advance.enable = false;
    g_extern.state_slot = 0;
    g_extern.audio_data.mute = 0;
    g_extern.verbose = true;
diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c
index 769dbaeada..80b3df37b9 100644
--- a/console/rmenu/rmenu.c
+++ b/console/rmenu/rmenu.c
@@ -2373,7 +2373,7 @@ void menu_loop(void)
 
       // 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.console.rmenu.mode == MODE_EMULATION && !g_extern.console.screen.state.frame_advance.enable)
+      if(g_extern.console.rmenu.mode == MODE_EMULATION && !(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
       {
          SET_TIMER_EXPIRATION(0, 30);
       }
diff --git a/general.h b/general.h
index a134b7085c..198dfaaf2a 100644
--- a/general.h
+++ b/general.h
@@ -530,7 +530,6 @@ struct global
 
          struct
          {
-            rarch_boolean_state_t frame_advance;
             rarch_boolean_state_t triple_buffering;
             rarch_boolean_state_t overscan;
             rarch_boolean_state_t flicker_filter;
diff --git a/gx/frontend/main.c b/gx/frontend/main.c
index 9770e8676b..bf7a4d048e 100644
--- a/gx/frontend/main.c
+++ b/gx/frontend/main.c
@@ -578,7 +578,7 @@ begin_loop:
 
       do{
          repeat = rarch_main_iterate();
-      }while(repeat && !g_extern.console.screen.state.frame_advance.enable);
+      }while(repeat);
 
       audio_stop_func();
    }
diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c
index 3ebae5ad2c..f968cc116c 100644
--- a/ps3/frontend/main.c
+++ b/ps3/frontend/main.c
@@ -352,7 +352,7 @@ begin_loop:
 
       do{
          repeat = rarch_main_iterate();
-      }while(repeat && !g_extern.console.screen.state.frame_advance.enable);
+      }while(repeat);
    }
    else if(g_extern.console.rmenu.mode == MODE_MENU)
    {
diff --git a/psp/frontend/main.c b/psp/frontend/main.c
index 97c7dad708..c383cd10c0 100644
--- a/psp/frontend/main.c
+++ b/psp/frontend/main.c
@@ -175,7 +175,7 @@ begin_loop:
       do{
          repeat = rarch_main_iterate();
          RARCH_LOG("Iterate: %d\n", count++);
-      }while(repeat && !g_extern.console.screen.state.frame_advance.enable);
+      }while(repeat);
    }
    else if(g_extern.console.rmenu.mode == MODE_MENU)
    {
diff --git a/xdk/frontend/main.c b/xdk/frontend/main.c
index 627e7e685b..925ec8c454 100644
--- a/xdk/frontend/main.c
+++ b/xdk/frontend/main.c
@@ -192,7 +192,7 @@ begin_loop:
 
       do{
          repeat = rarch_main_iterate();
-      }while(repeat && !g_extern.console.screen.state.frame_advance.enable);
+      }while(repeat);
    }
    else if(g_extern.console.rmenu.mode == MODE_MENU)
    {