diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
index 2efa4ccaa..e05500ead 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
@@ -160,7 +160,7 @@
     [:div.component-item
      {:ref item-ref
       :class (stl/css-case :disabled loop)
-      :key (:id item)
+      :key (str "swap-item-" (:id item))
       :on-click on-select-component}
      (when visible?
        [:& cmm/component-item-thumbnail {:file-id (:file-id item)
@@ -232,7 +232,7 @@
                              (mapcat get-subgroups)
                              (remove str/empty?)
                              (remove nil?)
-                             distinct
+                             (distinct)
                              (filter #(= (cph/butlast-path %) (:path filters))))
 
         groups              (when-not is-search?