diff --git a/src/graphical_preferences_editor.cc b/src/graphical_preferences_editor.cc
index 4cb2848..45b3746 100644
--- a/src/graphical_preferences_editor.cc
+++ b/src/graphical_preferences_editor.cc
@@ -228,7 +228,7 @@ PreferencesEditor::PreferencesEditor(const std::string& gladefile)
 	close->signal_clicked().connect(sigc::mem_fun(*this, &PreferencesEditor::on_close));
 
 	// Window& main_window = get_initial_window();
-  preferences_dialog->show();
+  preferences_dialog->run();
 }
 
 
diff --git a/src/gui_builder.cc b/src/gui_builder.cc
index d598b98..a55ae7c 100644
--- a/src/gui_builder.cc
+++ b/src/gui_builder.cc
@@ -77,8 +77,7 @@ using Gnome::Glade::Xml;
 void
 GuiBuilder::on_edit_preferences_activate()
 {
-	new PreferencesEditor(); //FIXME: are we leaking this way? (definitely yes. use
-                           // a refptr member data?)
+	PreferencesEditor(); // Will run the dialog inside the constructor.
 }
 
 void