diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp
index 0da86904f..3a5926f34 100644
--- a/src/c_cmds.cpp
+++ b/src/c_cmds.cpp
@@ -847,6 +847,8 @@ UNSAFE_CCMD (save)
         return;
     }
 
+	doquicksave = false;
+
 	FString fname;
 	for (int i = 0;; ++i)
 	{
diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp
index a9f8d64dd..6a107f246 100644
--- a/src/menu/loadsavemenu.cpp
+++ b/src/menu/loadsavemenu.cpp
@@ -372,7 +372,7 @@ void FSavegameManager::NotifyNewSave(const FString &file, const FString &title,
 			{
 				if (quickSaveSlot == nullptr || quickSaveSlot == (FSaveGameNode*)1 || forceQuicksave) quickSaveSlot = node;
 			}
-			if (!strstr(node->SaveTitle.GetChars(),"auto")) LastAccessed = LastSaved = i;
+			if (!strstr(node->SaveTitle.GetChars(),"Autosave")) LastAccessed = LastSaved = i;
 			return;
 		}
 	}
@@ -388,7 +388,8 @@ void FSavegameManager::NotifyNewSave(const FString &file, const FString &title,
 	{
 		if (quickSaveSlot == nullptr || quickSaveSlot == (FSaveGameNode*)1 || forceQuicksave) quickSaveSlot = node;
 	}
-	if (!strstr(node->SaveTitle.GetChars(),"auto")) LastAccessed = LastSaved = index;
+	if (!strstr(node->SaveTitle.GetChars(),"Autosave")) LastAccessed = LastSaved = index;
+	else LastAccessed = ++LastSaved;
 }
 
 //=============================================================================