diff --git a/CHANGES.md b/CHANGES.md
index c4f49b33e..60f456267 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -75,6 +75,7 @@
 - Fix zoom in/out after fit or fill [Taiga #2630](https://tree.taiga.io/project/penpot/issue/2630)
 - Normalize zoom levels in workspace and viewer [Taiga #2631](https://tree.taiga.io/project/penpot/issue/2631)
 - Avoid empty names in projects, files and pages [Taiga #2594](https://tree.taiga.io/project/penpot/issue/2594)
+- Fix "move to" menu when duplicated team or project names [Taiga #2655](https://tree.taiga.io/project/penpot/issue/2655)
 
 ### :arrow_up: Deps updates
 
diff --git a/frontend/src/app/main/ui/components/context_menu.cljs b/frontend/src/app/main/ui/components/context_menu.cljs
index 617436a4a..b83efcc14 100644
--- a/frontend/src/app/main/ui/components/context_menu.cljs
+++ b/frontend/src/app/main/ui/components/context_menu.cljs
@@ -6,6 +6,7 @@
 
 (ns app.main.ui.components.context-menu
   (:require
+   [app.common.data :as d]
    [app.main.refs :as refs]
    [app.main.ui.components.dropdown :refer [dropdown']]
    [app.main.ui.icons :as i]
@@ -100,13 +101,13 @@
                 [:span i/arrow-slide]
                 parent-option]]
               [:li.separator]])
-           (for [[option-name option-handler sub-options] (:options level)]
+           (for [[index [option-name option-handler sub-options]] (d/enumerate (:options level))]
              (when option-name
                (if (= option-name :separator)
                  [:li.separator]
                  [:li.context-menu-item
                   {:class (dom/classnames :is-selected (and selected (= option-name selected)))
-                   :key option-name}
+                   :key index}
                   (if-not sub-options
                     [:a.context-menu-action {:on-click #(do (dom/stop-propagation %)
                                                             (on-close)