diff --git a/gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy b/gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
index 9d783da2..868bee63 100644
--- a/gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
@@ -93,7 +93,8 @@ class BrowseModel {
                 root.add(topLevel)
             }
             view.refreshResults()
-            view.expandUnconditionally()
+            if (session == null || !session.supportsIncremental())
+                view.expandUnconditionally()
         }
     }