diff --git a/gtk/tr_core.c b/gtk/tr_core.c
index a6890c09b..68769da85 100644
--- a/gtk/tr_core.c
+++ b/gtk/tr_core.c
@@ -384,10 +384,10 @@ tr_core_new( void )
     TrCore * core = TR_CORE( g_object_new( TR_CORE_TYPE, NULL ) );
 
     /* init from prefs & listen to pref changes */
-    g_signal_connect( core, "prefs-changed", G_CALLBACK(prefsChanged), NULL );
     prefsChanged( core, PREF_KEY_SORT_MODE, NULL );
     prefsChanged( core, PREF_KEY_SORT_REVERSED, NULL );
     prefsChanged( core, PREF_KEY_MAX_PEERS_GLOBAL, NULL );
+    g_signal_connect( core, "prefs-changed", G_CALLBACK(prefsChanged), NULL );
 
     return core;
 }
diff --git a/gtk/tr_window.c b/gtk/tr_window.c
index 9c5c1c445..d2cb130db 100644
--- a/gtk/tr_window.c
+++ b/gtk/tr_window.c
@@ -303,11 +303,11 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
     gtk_widget_show_all( vbox );
 
     /* listen for prefs changes that affect the window */
+    p->core = core;
     prefsChanged( core, PREF_KEY_MINIMAL_VIEW, self );
     prefsChanged( core, PREF_KEY_STATUS_BAR, self );
     prefsChanged( core, PREF_KEY_STATUS_BAR_STATS, self );
     prefsChanged( core, PREF_KEY_TOOLBAR, self );
-    p->core = core;
     p->pref_handler_id = g_signal_connect( core, "prefs-changed",
                                            G_CALLBACK(prefsChanged), self );