diff --git a/src/preferences/locale/Locale.cpp b/src/preferences/locale/Locale.cpp
index f10f3366be..7d89f2bdc4 100644
--- a/src/preferences/locale/Locale.cpp
+++ b/src/preferences/locale/Locale.cpp
@@ -190,6 +190,12 @@ LocalePreflet::AboutRequested()
 bool
 LocalePreflet::QuitRequested()
 {
+	if (fLocaleWindow != NULL) {
+		fLocaleWindow->PostMessage(B_QUIT_REQUESTED);
+		fLocaleWindow = NULL;
+		return false;
+	}
+
 	return true;
 }
 
diff --git a/src/preferences/locale/LocaleWindow.cpp b/src/preferences/locale/LocaleWindow.cpp
index dd31f67fc2..0ab8b643bc 100644
--- a/src/preferences/locale/LocaleWindow.cpp
+++ b/src/preferences/locale/LocaleWindow.cpp
@@ -468,6 +468,8 @@ LocaleWindow::QuitRequested()
 	be_app_messenger.SendMessage(&update);
 
 	be_app_messenger.SendMessage(B_QUIT_REQUESTED);
+	be_app_messenger.SendMessage(B_QUIT_REQUESTED);
+		// app eats the first message
 	return true;
 }