diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
index bec9538703..948cfdb6fc 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
@@ -368,7 +368,10 @@
         search-and-filters
         (fn [[id shape]]
           (let [search (:search-text @filter-state)
-                filters (:active-filters @filter-state)]
+                filters (:active-filters @filter-state)
+                filters (cond-> filters
+                          (some #{:shape} filters)
+                          (conj :rect :circle :path :bool))]
             (or
              (= uuid/zero id)
              (and