diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs
index 8de92b734..2bfebf331 100644
--- a/frontend/src/uxbox/main/data/workspace.cljs
+++ b/frontend/src/uxbox/main/data/workspace.cljs
@@ -1020,7 +1020,8 @@
     ptk/UpdateEvent
     (update [_ state]
       (let [mdata {:position position
-                   :shape shape}]
+                   :shape shape
+                   :selected (get-in state [:workspace-local :selected])}]
         (-> state
             (assoc-in [:workspace-local :context-menu] mdata))))
 
diff --git a/frontend/src/uxbox/main/ui/workspace/context_menu.cljs b/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
index b2f6921ab..16445a6ba 100644
--- a/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
@@ -90,7 +90,7 @@
                        :shortcut "g"
                        :on-click do-create-group}])
 
-     (when (and (= (count selected)) (= (:type shape) :group))
+     (when (and (= (count selected) 1) (= (:type shape) :group))
        [:& menu-entry {:title "Ungroup"
                        :shortcut "Shift + g"
                        :on-click do-remove-group}])