1 files changed, 3 insertions, 6 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 1f68b36e..a0d1e227 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -118,8 +118,10 @@ static void eventProcessor(void * cls,
 static void * shutdownCode(Semaphore * sig) {
   fs_download_stop();
   fs_search_stop();
-  FSUI_stop(ctx);
+  fs_collection_stop();
+  fs_namespace_stop();
   fs_upload_stop();
+  FSUI_stop(ctx);
   SEMAPHORE_UP(sig);
   return NULL;
 }
@@ -155,11 +157,6 @@ void done_fs() {
   Semaphore * sig;
   void * unused;
 
-  fs_upload_stop();
-  fs_download_stop();
-  fs_search_stop();
-  fs_namespace_stop();
-  fs_collection_stop();
   sig = SEMAPHORE_NEW(0);
   if (0 != PTHREAD_CREATE(&doneThread,
                           (PThreadMain)&shutdownCode,