diff --git a/browser/components/places/content/treeView.js b/browser/components/places/content/treeView.js
index 7647d9d9966..2ffbc2a3329 100644
--- a/browser/components/places/content/treeView.js
+++ b/browser/components/places/content/treeView.js
@@ -943,8 +943,10 @@ PlacesTreeView.prototype = {
 
       // treat non-expandable queries as non-containers
       if (PlacesUtils.nodeIsQuery(node)) {
-        asQuery(node);
-        return node.queryOptions.expandQueries;
+        var parent = node.parent;
+        if(PlacesUtils.nodeIsQuery(parent) ||
+           PlacesUtils.nodeIsFolder(parent))
+          return asQuery(parent).queryOptions.expandQueries;
       }
       return true;
     }