diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index cf8c2b989..9090f9e12 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1875,6 +1875,7 @@ moviebrowser.menu_save Veränderungen speichern
 moviebrowser.menu_save_all Starte Übernahme in allen sichtbaren Filminfos
 moviebrowser.menu_settings Einstellungen
 moviebrowser.menu_truncate Film kürzen
+moviebrowser.message_keep_storage_settings Sollen die Depot-Einstellungen für verwendete und aktivierte Verzeichnisse beibehalten werden?
 moviebrowser.option_browser Anzeigeoptionen
 moviebrowser.reload_at_start Filminfos neu laden bei Start
 moviebrowser.remount_at_start Filmdepot verbinden bei Start
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 79cdbacee..1146b08ee 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1875,6 +1875,7 @@ moviebrowser.menu_save Save changes
 moviebrowser.menu_save_all Start update of movie info files
 moviebrowser.menu_settings Settings
 moviebrowser.menu_truncate Truncate movie
+moviebrowser.message_keep_storage_settings Do You want to keep storage settings for used and enabled directories?
 moviebrowser.option_browser Browser Options
 moviebrowser.reload_at_start Reload movie info at start
 moviebrowser.remount_at_start Remount at start
diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp
index 69d5af722..b7a9d4a03 100644
--- a/src/gui/moviebrowser/mb.cpp
+++ b/src/gui/moviebrowser/mb.cpp
@@ -600,9 +600,21 @@ void CMovieBrowser::initRows(void)
 
 void CMovieBrowser::defaultSettings(MB_SETTINGS* /*settings*/)
 {
+	MBStorageSettings tmp_store;
+	bool keep = false;
+
+	if (ShowMsg(LOCALE_MOVIEBROWSER_LOAD_DEFAULT, LOCALE_MOVIEBROWSER_MESSAGE_KEEP_STORAGE_SETTINGS, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_QUESTION) == CMsgBox::mbrYes)
+	{
+		tmp_store = m_settings.store;
+		keep = true;
+	}
+
 	unlink(MOVIEBROWSER_SETTINGS_FILE);
 	configfile.clear();
 	initGlobalSettings();
+
+	if (keep)
+		m_settings.store = tmp_store;
 }
 
 bool CMovieBrowser::loadSettings(MB_SETTINGS* settings)
diff --git a/src/system/locals.h b/src/system/locals.h
index 89ae5ccbe..256cde3cb 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1902,6 +1902,7 @@ typedef enum
 	LOCALE_MOVIEBROWSER_MENU_SAVE_ALL,
 	LOCALE_MOVIEBROWSER_MENU_SETTINGS,
 	LOCALE_MOVIEBROWSER_MENU_TRUNCATE,
+	LOCALE_MOVIEBROWSER_MESSAGE_KEEP_STORAGE_SETTINGS,
 	LOCALE_MOVIEBROWSER_OPTION_BROWSER,
 	LOCALE_MOVIEBROWSER_RELOAD_AT_START,
 	LOCALE_MOVIEBROWSER_REMOUNT_AT_START,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index fc3a178e3..f6fe796c9 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1902,6 +1902,7 @@ const char * locale_real_names[] =
 	"moviebrowser.menu_save_all",
 	"moviebrowser.menu_settings",
 	"moviebrowser.menu_truncate",
+	"moviebrowser.message_keep_storage_settings",
 	"moviebrowser.option_browser",
 	"moviebrowser.reload_at_start",
 	"moviebrowser.remount_at_start",