diff --git a/app/web/src/render/ed/panel/popup/site/site-tree.tsx b/app/web/src/render/ed/panel/popup/site/site-tree.tsx
index 175a3c2b..4b2b9182 100644
--- a/app/web/src/render/ed/panel/popup/site/site-tree.tsx
+++ b/app/web/src/render/ed/panel/popup/site/site-tree.tsx
@@ -370,8 +370,11 @@ export const EdSiteTree = ({
         dragPreviewRender={() => <></>}
         classes={{
           root: cx(
-            "flex flex-1 items-stretch overflow-auto",
-            search ? "flex-row" : "flex-col",
+            "flex overflow-auto",
+            search
+              ? "flex-row items-start flex-wrap"
+              : "flex-col items-stretch flex-1 ",
+
             !search &&
               css`
                 flex-wrap: nowrap;
@@ -386,7 +389,7 @@ export const EdSiteTree = ({
                 }
               `
           ),
-          container: "flex flex-row flex-wrap pb-2",
+          container: cx(!search && "flex flex-row flex-wrap pb-2"),
         }}
         render={render}
       />
diff --git a/app/web/src/utils/ui/fuzzy.tsx b/app/web/src/utils/ui/fuzzy.tsx
index b174ccca..0cb312c3 100644
--- a/app/web/src/utils/ui/fuzzy.tsx
+++ b/app/web/src/utils/ui/fuzzy.tsx
@@ -13,10 +13,10 @@ export const fuzzy = <T extends object>(
 
   if (idxs && info) {
     const result = [] as T[];
-    let i = 0;
+    let ri = 0;
     for (const idx of idxs) {
       const item = array[idx];
-      const range = [...info.ranges[i]];
+      const range = [...info.ranges[ri++]];
       const val = item[field] as string;
 
       let cur = range.shift();