diff --git a/src/bonsai/bonsai/bim/module/search/data.py b/src/bonsai/bonsai/bim/module/search/data.py
index 8c2fad00b0..ec954004c6 100644
--- a/src/bonsai/bonsai/bim/module/search/data.py
+++ b/src/bonsai/bonsai/bim/module/search/data.py
@@ -132,5 +132,12 @@ class SelectSimilarData:
             if pset.endswith("Common"):
                 keys.extend([f'/.*Common/."{name}"' for name in properties.keys() if name != "id"])
             else:
-                keys.extend([f"{pset}.{name}" for name in properties.keys() if name != "id"])
+                pset_part = f'"{pset}"' if " " in pset else pset
+                keys.extend(
+                    [
+                        f'{pset_part}."{name}"' if " " in name else f"{pset_part}.{name}"
+                        for name in properties.keys()
+                        if name != "id"
+                    ]
+                )
         return [(k, k, "") for k in keys]