diff --git a/src/scenario.c b/src/scenario.c
index 82baeddefb..0a8ddebea0 100644
--- a/src/scenario.c
+++ b/src/scenario.c
@@ -45,7 +45,7 @@
 #include "world/water.h"
 
 static char _scenarioPath[MAX_PATH];
-static const char *_scenarioFileName;
+static const char *_scenarioFileName = "";
 
 char gScenarioSaveName[MAX_PATH];
 int gFirstTimeSave = 1;
diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c
index a164f8af22..f6930b2ad9 100644
--- a/src/windows/loadsave.c
+++ b/src/windows/loadsave.c
@@ -801,6 +801,7 @@ static void window_loadsave_select(rct_window *w, const char *path)
 	case (LOADSAVETYPE_SAVE | LOADSAVETYPE_LANDSCAPE) :
 		rw = SDL_RWFromFile(path, "wb+");
 		if (rw != NULL) {
+			scenario_set_filename(path);
 			int success = scenario_save(rw, gConfigGeneral.save_plugin_data ? 3 : 2);
 			SDL_RWclose(rw);
 			if (success) {
@@ -822,6 +823,7 @@ static void window_loadsave_select(rct_window *w, const char *path)
 		rw = SDL_RWFromFile(path, "wb+");
 		int success = 0;
 		if (rw != NULL) {
+			scenario_set_filename(path);
 			success = scenario_save(rw, gConfigGeneral.save_plugin_data ? 3 : 2);
 			SDL_RWclose(rw);
 		}