diff --git a/gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy b/gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
index a5a74369..33ced4a8 100644
--- a/gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
@@ -71,9 +71,9 @@ class BrowseModel {
         view.clearForFilter()
         view.refreshResults() 
         if (filter != null) {
+            setFilterEnabled(false)
             filterer = new Filterer()
             filterer.execute()
-            setFilterEnabled(false)
         } else {
             synchronized (allResults) {
                 results.addAll(allResults)
diff --git a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
index ca2f3e7e..219bc51a 100644
--- a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
@@ -501,9 +501,9 @@ class MainFrameModel {
         treeRoot.removeAllChildren()
         view.refreshSharedFiles()
         if (filter != null) {
+            setFilteringEnabled(false)
             filterer = new Filterer()
             filterer.execute()
-            setFilteringEnabled(false)
         } else {
             synchronized (allSharedFiles) {
                 shared.addAll(allSharedFiles)