1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 8b2b5302..d8521179 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -636,6 +636,7 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
     }
     list = list->next;
   }
+  /* FIXME: deadlock! */
   FSUI_startSearch(ctx,
                    getSpinButtonValue(getMainXML(),
                                       "searchAnonymitySelectionSpinButton"),    
@@ -696,6 +697,7 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
 void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
                                      GtkWidget * closeButton) {
   SearchList * list;
+  struct FCBC fcbc;
 
   list = search_head;
   while (list != NULL) {
@@ -704,8 +706,11 @@ void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-  FSUI_abortSearch(ctx,
-                   list->fsui_list);
+
+  fcbc.method = &FSUI_abortSearch;
+  fcbc.argument = list->fsui_list;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
 }
 
 static void stopSearch(GtkTreeModel * model,