diff --git a/gfx/drivers_context/win32_common.c b/gfx/drivers_context/win32_common.c
index b3ef9a9757..cc6a17b6fb 100644
--- a/gfx/drivers_context/win32_common.c
+++ b/gfx/drivers_context/win32_common.c
@@ -143,9 +143,14 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
 		g_extern.pending.windowed_scale = idx;
 		cmd = RARCH_CMD_RESIZE_WINDOWED_SCALE;
 	}
-	if (mode >= ID_M_STATE_INDEX_AUTO && mode <= (ID_M_STATE_INDEX_AUTO+10))
+	else if (mode == ID_M_STATE_INDEX_AUTO)
 	{
-		signed idx = (mode - (ID_M_STATE_INDEX_AUTO));
+		signed idx = -1;
+		g_settings.state_slot = idx;
+	}
+	else if (mode >= (ID_M_STATE_INDEX_AUTO+1) && mode <= (ID_M_STATE_INDEX_AUTO+10))
+	{
+		signed idx = (mode - (ID_M_STATE_INDEX_AUTO+1));
 		g_settings.state_slot = idx;
 	}