diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp
index 6a3d5f0df..86baab908 100644
--- a/src/menu/loadsavemenu.cpp
+++ b/src/menu/loadsavemenu.cpp
@@ -342,7 +342,7 @@ void FSavegameManager::NotifyNewSave(const FString &file, const FString &title,
 			node->bMissingWads = false;
 			if (okForQuicksave)
 			{
-				if (quickSaveSlot == nullptr || forceQuicksave) quickSaveSlot = node;
+				if (quickSaveSlot == nullptr || quickSaveSlot == (FSaveGameNode*)1 || forceQuicksave) quickSaveSlot = node;
 				LastAccessed = LastSaved = i;
 			}
 			return;
@@ -358,7 +358,7 @@ void FSavegameManager::NotifyNewSave(const FString &file, const FString &title,
 
 	if (okForQuicksave)
 	{
-		if (quickSaveSlot == nullptr || forceQuicksave) quickSaveSlot = node;
+		if (quickSaveSlot == nullptr || quickSaveSlot == (FSaveGameNode*)1 || forceQuicksave) quickSaveSlot = node;
 		LastAccessed = LastSaved = index;
 	}
 }
diff --git a/src/menu/messagebox.cpp b/src/menu/messagebox.cpp
index 732ad8001..6d72f81e4 100644
--- a/src/menu/messagebox.cpp
+++ b/src/menu/messagebox.cpp
@@ -183,7 +183,7 @@ CCMD (quicksave)
 		return;
 	}
 		
-	if (savegameManager.quickSaveSlot == NULL)
+	if (savegameManager.quickSaveSlot == NULL || savegameManager.quickSaveSlot == (FSaveGameNode*)1)
 	{
 		S_Sound(CHAN_VOICE | CHAN_UI, "menu/activate", snd_menuvolume, ATTN_NONE);
 		M_StartControlPanel(false);
@@ -228,7 +228,7 @@ CCMD (quickload)
 		return;
 	}
 		
-	if (savegameManager.quickSaveSlot == NULL)
+	if (savegameManager.quickSaveSlot == NULL || savegameManager.quickSaveSlot == (FSaveGameNode*)1)
 	{
 		M_StartControlPanel(true);
 		// signal that whatever gets loaded should be the new quicksave