diff --git a/source/java/org/alfresco/web/bean/SearchContext.java b/source/java/org/alfresco/web/bean/SearchContext.java
index e085ed9efd..602aef2b6a 100644
--- a/source/java/org/alfresco/web/bean/SearchContext.java
+++ b/source/java/org/alfresco/web/bean/SearchContext.java
@@ -243,7 +243,7 @@ public final class SearchContext implements Serializable
             pathQuery.append(" PATH:\"").append(location).append("\" ");
             if (categories != null && categories.length != 0)
             {
-               pathQuery.append("AND");
+               pathQuery.append("AND (");
             }
          }
          if (categories != null && categories.length != 0)
@@ -256,6 +256,10 @@ public final class SearchContext implements Serializable
                }
                pathQuery.append(" PATH:\"").append(categories[i]).append("\" ");
             }
+            if (location != null)
+            {
+               pathQuery.append(") ");
+            }
          }
       }