diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
index debc36252..afe62a2b1 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
@@ -144,7 +144,10 @@
                   (conj :rect :circle :path :bool))]
     (or (= uuid/zero id)
         (and (or (str/includes? (str/lower (:name shape)) (str/lower search))
-                 (str/includes? (dm/str (:id shape)) (str/lower search)))
+                 ;; Only for local development we allow search for ids. Otherwise will be hard
+                 ;; search for numbers or single letter shape names (ie: "A")
+                 (and *assert*
+                      (str/includes? (dm/str (:id shape)) (str/lower search))))
              (or (empty? filters)
                  (and (contains? filters :component)
                       (contains? shape :component-id))