diff --git a/src/hotkey/hotkey_handler.cpp b/src/hotkey/hotkey_handler.cpp
index f824b9359e5..1eae35ea632 100644
--- a/src/hotkey/hotkey_handler.cpp
+++ b/src/hotkey/hotkey_handler.cpp
@@ -380,7 +380,6 @@ void play_controller::hotkey_handler::expand_autosaves(std::vector<config>& item
 {
 	const compression::format comp_format = preferences::save_compression_format();
 
-	savenames_.clear();
 	savenames_.resize(i);
 
 	auto pos = items.erase(items.begin() + i);
@@ -445,7 +444,9 @@ void play_controller::hotkey_handler::show_menu(const std::vector<config>& items
 
 	// Add special non-hotkey items to the menu and remember their indices
 	// Iterate in reverse to avoid also iterating over the new inserted items
+	savenames_.clear();
 	wml_commands_.clear();
+
 	for(int i = items.size() - 1; i >= 0; i--) {
 		if(items[i]["id"] == "AUTOSAVES") {
 			expand_autosaves(items, i);