diff --git a/Core/EmulationSettings.h b/Core/EmulationSettings.h
index 3c589d91..e72a7fbb 100644
--- a/Core/EmulationSettings.h
+++ b/Core/EmulationSettings.h
@@ -289,6 +289,8 @@ enum class EmulatorShortcut
 
 	ToggleCheats,
 	ToggleAudio,
+	ToggleFastForward,
+	ToggleRewind,
 
 	RunSingleFrame,
 
@@ -347,9 +349,6 @@ enum class EmulatorShortcut
 	OpenMemoryTools,
 	OpenScriptWindow,
 	OpenTraceLogger,
-
-	ToggleFastForward,
-	ToggleRewind,
 };
 
 struct KeyCombination
diff --git a/Core/SaveStateManager.cpp b/Core/SaveStateManager.cpp
index 0a7e2d4a..f738afff 100644
--- a/Core/SaveStateManager.cpp
+++ b/Core/SaveStateManager.cpp
@@ -89,7 +89,6 @@ void SaveStateManager::SaveState(int stateIndex, bool displayMessage)
 {
 	string filepath = SaveStateManager::GetStateFilepath(stateIndex);
 	if(SaveState(filepath)) {
-		_lastIndex = stateIndex;
 		if(displayMessage) {
 			MessageManager::DisplayMessage("SaveStates", "SaveStateSaved", std::to_string(stateIndex));
 		}
@@ -173,7 +172,6 @@ bool SaveStateManager::LoadState(int stateIndex)
 {
 	string filepath = SaveStateManager::GetStateFilepath(stateIndex);
 	if(LoadState(filepath, false)) {
-		_lastIndex = stateIndex;
 		MessageManager::DisplayMessage("SaveStates", "SaveStateLoaded", std::to_string(stateIndex));
 		return true;
 	}
diff --git a/GUI.NET/InteropEmu.cs b/GUI.NET/InteropEmu.cs
index d9888c7a..02546dd9 100644
--- a/GUI.NET/InteropEmu.cs
+++ b/GUI.NET/InteropEmu.cs
@@ -1387,6 +1387,8 @@ namespace Mesen.GUI
 
 		ToggleCheats,
 		ToggleAudio,
+		ToggleFastForward,
+		ToggleRewind,
 
 		RunSingleFrame,
 
@@ -1445,9 +1447,6 @@ namespace Mesen.GUI
 		OpenMemoryTools,
 		OpenScriptWindow,
 		OpenTraceLogger,
-
-		ToggleFastForward,
-		ToggleRewind,
 	}
 
 	public struct InteropCheatInfo