diff --git gui/gui_theme.cc gui/gui_theme.cc
index 968ed0704..bb96147f8 100644
--- gui/gui_theme.cc
+++ gui/gui_theme.cc
@@ -400,6 +400,7 @@ bool gui_theme_t::themes_init(const char *file_name, bool init_fonts, bool init_
 		obj_reader_t::read_file(buttonpak.c_str());
 		gui_theme_t::init_gui_from_images();
 		free(pathname);
+		dr_chdir(env_t::user_dir);
 	}
 
 	// first the stuff for the dialogues
diff --git gui/loadsave_frame.cc gui/loadsave_frame.cc
index 074ba9f86..a18bec06a 100644
--- gui/loadsave_frame.cc
+++ gui/loadsave_frame.cc
@@ -124,7 +124,7 @@ loadsave_frame_t::loadsave_frame_t(bool do_load) : savegame_frame_t(".sve",false
 	// load cached entries
 	if (cached_info.empty()) {
 		loadsave_t file;
-		/* We rename the old chace file and remove any incomplete read version.
+		/* We rename the old cache file and remove any incomplete read version.
 		 * Upon an error the cache will be rebuilt then next time.
 		 */
 		dr_rename( SAVE_PATH_X "_cached.xml", SAVE_PATH_X "_load_cached.xml" );