diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
index 4ec585f2d..4104fc14a 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
@@ -89,6 +89,9 @@
         reverse-sort?  (= :desc ordering)
         num-libs       (count (mf/deref refs/workspace-libraries))
 
+        show-templates-02-test?
+        (and (cf/external-feature-flag "templates-02" "test") (zero? num-libs))
+
         toggle-ordering
         (mf/use-fn
          (mf/deps ordering)
@@ -157,8 +160,7 @@
     [:article  {:class (stl/css :assets-bar)}
      [:div {:class (stl/css :assets-header)}
       (when-not ^boolean read-only?
-        (if (and (cf/external-feature-flag "templates-02" "test")
-                 (zero? num-libs))
+        (if show-templates-02-test?
           [:button {:class (stl/css :add-library-button)
                     :on-click show-libraries-dialog
                     :data-testid "libraries"}
@@ -170,31 +172,32 @@
             i/library]
            (tr "workspace.assets.libraries")]))
 
-      [:div {:class (stl/css :search-wrapper)}
-       [:& search-bar {:on-change on-search-term-change
-                       :value term
-                       :placeholder (tr "workspace.assets.search")}
-        [:button
-         {:on-click on-open-menu
-          :title (tr "workspace.assets.filter")
-          :class (stl/css-case :section-button true
-                               :opened menu-open?)}
-         i/filter-icon]]
-       [:> context-menu*
-        {:on-close on-menu-close
-         :selectable true
-         :selected section
-         :show menu-open?
-         :fixed true
-         :min-width true
-         :width size
-         :top 158
-         :left 18
-         :options options}]
-       [:> icon-button* {:variant "ghost"
-                         :aria-label (tr "workspace.assets.sort")
-                         :on-click toggle-ordering
-                         :icon (if reverse-sort? "asc-sort" "desc-sort")}]]]
+      (when-not show-templates-02-test?
+        [:div {:class (stl/css :search-wrapper)}
+         [:& search-bar {:on-change on-search-term-change
+                         :value term
+                         :placeholder (tr "workspace.assets.search")}
+          [:button
+           {:on-click on-open-menu
+            :title (tr "workspace.assets.filter")
+            :class (stl/css-case :section-button true
+                                 :opened menu-open?)}
+           i/filter-icon]]
+         [:> context-menu*
+          {:on-close on-menu-close
+           :selectable true
+           :selected section
+           :show menu-open?
+           :fixed true
+           :min-width true
+           :width size
+           :top 158
+           :left 18
+           :options options}]
+         [:> icon-button* {:variant "ghost"
+                           :aria-label (tr "workspace.assets.sort")
+                           :on-click toggle-ordering
+                           :icon (if reverse-sort? "asc-sort" "desc-sort")}]])]
 
      [:& (mf/provider cmm/assets-filters) {:value filters}
       [:& (mf/provider cmm/assets-toggle-ordering) {:value toggle-ordering}