diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index 165f227f33..3f6faa7795 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -336,6 +336,11 @@ static LRESULT win32_menu_loop(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))
+	{
+		signed idx = (mode - (ID_M_STATE_INDEX_AUTO));
+		g_settings.state_slot = idx;
+	}
 
 	if (cmd != RARCH_CMD_NONE)
 		rarch_main_command(cmd);
diff --git a/media/rarch.rc b/media/rarch.rc
index 165e2860a3..68377a1a68 100644
--- a/media/rarch.rc
+++ b/media/rarch.rc
@@ -15,6 +15,20 @@ BEGIN
    BEGIN
       POPUP "Save State Options"
       BEGIN
+		 POPUP "State Index"
+		 BEGIN
+			MENUITEM "-1 (Auto)", ID_M_STATE_INDEX_AUTO
+			MENUITEM "0", ID_M_STATE_INDEX_AUTO + 1
+			MENUITEM "1", ID_M_STATE_INDEX_AUTO + 2
+			MENUITEM "2", ID_M_STATE_INDEX_AUTO + 3
+			MENUITEM "3", ID_M_STATE_INDEX_AUTO + 4
+			MENUITEM "4", ID_M_STATE_INDEX_AUTO + 5
+			MENUITEM "5", ID_M_STATE_INDEX_AUTO + 6
+			MENUITEM "6", ID_M_STATE_INDEX_AUTO + 7
+			MENUITEM "7", ID_M_STATE_INDEX_AUTO + 8
+			MENUITEM "8", ID_M_STATE_INDEX_AUTO + 9
+			MENUITEM "9", ID_M_STATE_INDEX_AUTO + 10
+		 END
          MENUITEM "Load State",   ID_M_LOAD_STATE
          MENUITEM "Save State",   ID_M_SAVE_STATE
       END
diff --git a/win32/resource.h b/win32/resource.h
index 8137b73588..3ed78f6f88 100644
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -24,3 +24,4 @@
 #define ID_M_WINDOW_SCALE_10X 40021
 #define ID_M_FULL_SCREEN	40022
 #define ID_M_MOUSE_GRAB		40023
+#define ID_M_STATE_INDEX_AUTO 40024