1 files changed, 2 insertions, 5 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index c1a62304..04145ac2 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -2747,8 +2747,6 @@ run (void *cls,
 
   ml = cls;
   cfg = GNUNET_GTK_main_loop_get_configuration (ml);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleanup_task, NULL);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
                                            "gnunet-namestore-gtk",
@@ -2763,10 +2761,7 @@ run (void *cls,
   }
   if (GNUNET_OK !=
       GNUNET_GTK_main_loop_build_window (ml, NULL))
-  {
-    GNUNET_SCHEDULER_shutdown ();
     return;
-  }
   GNUNET_GTK_set_icon_search_path ();
   GNUNET_GTK_setup_nls ();
 
@@ -2793,6 +2788,8 @@ run (void *cls,
                                       NULL);
   gtk_widget_show (main_window);
   gtk_window_present (GTK_WINDOW (main_window));
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                &cleanup_task, NULL);
 }