1 files changed, 3 insertions, 2 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index fca53a6d..67a7059f 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -99,6 +99,7 @@ GNUNET_FS_GTK_get_main_window_object (const char *name)
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  GNUNET_GTK_main_loop_quit (ml);
   if (fs != NULL)
   {
     GNUNET_FS_stop (fs);
@@ -116,8 +117,8 @@ void
 GNUNET_GTK_quit_cb (GObject * object, gpointer user_data)
 {
   GNUNET_GTK_tray_icon_destroy ();
-  GNUNET_GTK_main_loop_quit (ml);
-  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                      &shutdown_task, NULL);
 }