diff --git a/CHANGES.md b/CHANGES.md
index 34a49d12e..1706f9ebd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@
 ### :bug: Bugs fixed
 
 - Fix problem with overflow dropdown on stroke-cap [#1216](https://github.com/penpot/penpot/issues/1216)
+- Fix menu context for single element nested in components [#1186](https://github.com/penpot/penpot/issues/1186)
 
 ### :arrow_up: Deps updates
 ### :boom: Breaking changes
diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs
index 4f35630cc..6833c4070 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/context_menu.cljs
@@ -279,9 +279,7 @@
            [:& menu-entry {:title (tr "workspace.shape.menu.delete-flow-start")
                            :on-click (do-remove-flow flow)}])))
 
-     (when (and (or (nil? (:shape-ref shape))
-                    (> (count selected) 1))
-                (not= (:type shape) :frame))
+     (when (not= (:type shape) :frame)
        [:*
         [:& menu-separator]
         [:& menu-entry {:title (tr "workspace.shape.menu.create-component")