diff --git a/src/game.c b/src/game.c
index 7463dc8e5e..758959c3db 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1059,7 +1059,10 @@ void save_game()
 }
 void save_game_as()
 {
-	window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME, (char*)path_get_filename(gScenarioSavePath));
+	char name[MAX_PATH];
+	safe_strncpy(name, path_get_filename(gScenarioSavePath), MAX_PATH);
+	path_remove_extension(name);
+	window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME, name);
 }
 
 int compare_autosave_file_paths (const void * a, const void * b ) {
diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c
index 42842a8723..6bab177bd2 100644
--- a/src/windows/loadsave.c
+++ b/src/windows/loadsave.c
@@ -154,7 +154,7 @@ rct_window *window_loadsave_open(int type, char *defaultName)
 	int includeNewItem;
 	rct_window* w;
 	_type = type;
-	_defaultName[0] = 0;
+	_defaultName[0] = '\0';
 
 	if (!str_is_null_or_empty(defaultName)) {
 		safe_strncpy(_defaultName, defaultName, sizeof(_defaultName));