diff --git a/src/preferences/locale/TimeFormatSettingsView.cpp b/src/preferences/locale/TimeFormatSettingsView.cpp
index 36f3bb82c0..8f7d8ef14f 100644
--- a/src/preferences/locale/TimeFormatSettingsView.cpp
+++ b/src/preferences/locale/TimeFormatSettingsView.cpp
@@ -354,6 +354,12 @@ FormatView::FormatView(BCountry* country)
 }
 
 
+FormatView::~FormatView()
+{
+	be_locale_roster->SetDefaultCountry(&fCountry);
+}
+
+
 void
 FormatView::AttachedToWindow()
 {
diff --git a/src/preferences/locale/TimeFormatSettingsView.h b/src/preferences/locale/TimeFormatSettingsView.h
index 624b88cf15..4a0df9b3a0 100644
--- a/src/preferences/locale/TimeFormatSettingsView.h
+++ b/src/preferences/locale/TimeFormatSettingsView.h
@@ -38,6 +38,7 @@ const uint32 kMenuMessage = 'FRMT';
 class FormatView : public BView {
 public:
 								FormatView(BCountry* country);
+								~FormatView();
 
 	virtual	void				MessageReceived(BMessage* message);
 	virtual	void				AttachedToWindow();