diff --git a/Core/AutoSaveManager.h b/Core/AutoSaveManager.h
index b11ceb72..29339024 100644
--- a/Core/AutoSaveManager.h
+++ b/Core/AutoSaveManager.h
@@ -6,7 +6,7 @@
 class AutoSaveManager
 {
 private:
-	const uint32_t _autoSaveSlot = 6;
+	const uint32_t _autoSaveSlot = 8;
 	std::thread _autoSaveThread;
 	atomic<bool> _stopThread;
 	Timer _timer;
diff --git a/Core/SaveStateManager.h b/Core/SaveStateManager.h
index bd244905..b15da653 100644
--- a/Core/SaveStateManager.h
+++ b/Core/SaveStateManager.h
@@ -5,7 +5,7 @@
 class SaveStateManager
 {
 private:
-	static const uint32_t MaxIndex = 5;
+	static const uint32_t MaxIndex = 7;
 	static atomic<uint32_t> _lastIndex;
 
 	static string GetStateFilepath(int stateIndex);	
diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml
index 51d39142..7b5d27ff 100644
--- a/GUI.NET/Dependencies/resources.es.xml
+++ b/GUI.NET/Dependencies/resources.es.xml
@@ -340,7 +340,7 @@
       <Control ID="tpgSaveData">Copias de seguridad</Control>
       <Control ID="grpAutomaticSaves">Guardado de estado automático</Control>
       <Control ID="chkAutoSave">Crear una copia de seguridad de cada estado</Control>
-      <Control ID="lblAutoSave">minutos (Pulse F6 para cargar)</Control>
+      <Control ID="lblAutoSave">minutos (Pulse F8 para cargar)</Control>
       <Control ID="chkAutoSaveNotify">Mostrar una notificación en pantalla al hacer la copia de seguridad automática</Control>
       <Control ID="grpCloudSaves">Copia de seguridad online</Control>
       <Control ID="chkFdsFastForwardOnLoad">Aumentar la velocidad de la emulación de juegos de carga FDS</Control>
diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml
index c54761b6..8bf50356 100644
--- a/GUI.NET/Dependencies/resources.fr.xml
+++ b/GUI.NET/Dependencies/resources.fr.xml
@@ -345,7 +345,7 @@
       <Control ID="tpgSaveData">Sauvegardes</Control>
       <Control ID="grpAutomaticSaves">Sauvegarde d'état automatique</Control>
       <Control ID="chkAutoSave">Créer une sauvegarde d'état à chaque</Control>
-      <Control ID="lblAutoSave">minutes (Appuyer sur F6 pour charger)</Control>
+      <Control ID="lblAutoSave">minutes (Appuyer sur F8 pour charger)</Control>
       <Control ID="chkAutoSaveNotify">Afficher une notification à l'écran au moment de la sauvegarde automatique</Control>
 
       <Control ID="grpCloudSaves">Sauvegarde en ligne</Control>
diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml
index df538712..c6b84ed7 100644
--- a/GUI.NET/Dependencies/resources.ja.xml
+++ b/GUI.NET/Dependencies/resources.ja.xml
@@ -344,7 +344,7 @@
       <Control ID="tpgSaveData">セーブデータ</Control>
       <Control ID="grpAutomaticSaves">オートクイックセーブ</Control>
       <Control ID="chkAutoSave">オートクイックセーブを</Control>
-      <Control ID="lblAutoSave">分おきにする（F6でクイックロード）</Control>
+      <Control ID="lblAutoSave">分おきにする（F8でクイックロード）</Control>
       <Control ID="chkAutoSaveNotify">オートクイックセーブする際、通信を表示する</Control>
 
       <Control ID="grpCloudSaves">クラウドバックアップ</Control>
diff --git a/GUI.NET/Dependencies/resources.pt.xml b/GUI.NET/Dependencies/resources.pt.xml
index d543c1af..edd77e08 100644
--- a/GUI.NET/Dependencies/resources.pt.xml
+++ b/GUI.NET/Dependencies/resources.pt.xml
@@ -340,7 +340,7 @@
       <Control ID="tpgSaveData">Cópias de segurança</Control>
       <Control ID="grpAutomaticSaves">Save state automático</Control>
       <Control ID="chkAutoSave">Criar uma cópia de segurança de cada state</Control>
-      <Control ID="lblAutoSave">minutos (Aperte F6 para carregar)</Control>
+      <Control ID="lblAutoSave">minutos (Aperte F8 para carregar)</Control>
       <Control ID="chkAutoSaveNotify">Mostrar uma notificação na tela ao fazer a cópia de segurança automática</Control>
       <Control ID="grpCloudSaves">Cópia de segurança online</Control>
       <Control ID="chkFdsFastForwardOnLoad">Aumentar a velocidade da emulação de jogos ao carregar no FDS</Control>
diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml
index 0bad6ed5..d1b21774 100644
--- a/GUI.NET/Dependencies/resources.ru.xml
+++ b/GUI.NET/Dependencies/resources.ru.xml
@@ -344,7 +344,7 @@
       <Control ID="tpgSaveData">Сохранения</Control>
       <Control ID="grpAutomaticSaves">Автоматические сохранения</Control>
       <Control ID="chkAutoSave">Автоматически создавать сохранения через</Control>
-      <Control ID="lblAutoSave">минут (нажмите F6 для загрузки)</Control>
+      <Control ID="lblAutoSave">минут (нажмите F8 для загрузки)</Control>
       <Control ID="chkAutoSaveNotify">Оповещать при сохранении</Control>
 
       <Control ID="grpCloudSaves">Облачные сохранения</Control>
diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml
index 4e7c86a5..2a51197f 100644
--- a/GUI.NET/Dependencies/resources.uk.xml
+++ b/GUI.NET/Dependencies/resources.uk.xml
@@ -344,7 +344,7 @@
       <Control ID="tpgSaveData">Збереження</Control>
       <Control ID="grpAutomaticSaves">Автоматичні збереження</Control>
       <Control ID="chkAutoSave">Автоматично створювати збереження через</Control>
-      <Control ID="lblAutoSave">хвилин (натисніть F6 для завантаження)</Control>
+      <Control ID="lblAutoSave">хвилин (натисніть F8 для завантаження)</Control>
       <Control ID="chkAutoSaveNotify">Сповіщати при збереженні</Control>
 
       <Control ID="grpCloudSaves">Хмарнi збереження</Control>
diff --git a/GUI.NET/Forms/Config/frmPreferences.Designer.cs b/GUI.NET/Forms/Config/frmPreferences.Designer.cs
index 5fa397fe..e9c2e4d5 100644
--- a/GUI.NET/Forms/Config/frmPreferences.Designer.cs
+++ b/GUI.NET/Forms/Config/frmPreferences.Designer.cs
@@ -587,7 +587,7 @@ namespace Mesen.GUI.Forms.Config
 			this.lblAutoSave.Name = "lblAutoSave";
 			this.lblAutoSave.Size = new System.Drawing.Size(99, 13);
 			this.lblAutoSave.TabIndex = 2;
-			this.lblAutoSave.Text = "minutes (F6 to load)";
+			this.lblAutoSave.Text = "minutes (F8 to load)";
 			// 
 			// tpgNsf
 			// 
diff --git a/GUI.NET/Forms/frmMain.cs b/GUI.NET/Forms/frmMain.cs
index e9dea1c2..79ff288f 100644
--- a/GUI.NET/Forms/frmMain.cs
+++ b/GUI.NET/Forms/frmMain.cs
@@ -760,7 +760,7 @@ namespace Mesen.GUI.Forms
 			return base.ProcessCmdKey(ref msg, keyData);
 		}
 
-		const int NumberOfSaveSlots = 5;
+		const int NumberOfSaveSlots = 7;
 		private void InitializeStateMenu(ToolStripMenuItem menu, bool forSave)
 		{
 			if(this.InvokeRequired) {
@@ -805,7 +805,7 @@ namespace Mesen.GUI.Forms
 
 				if(!forSave) {
 					menu.DropDownItems.Add("-");
-					addSaveStateInfo(6);
+					addSaveStateInfo(NumberOfSaveSlots+1);
 				}
 			}
 		}