diff --git a/src/uxbox/main/data/shapes.cljs b/src/uxbox/main/data/shapes.cljs
index d26c4d751..3fcf63db3 100644
--- a/src/uxbox/main/data/shapes.cljs
+++ b/src/uxbox/main/data/shapes.cljs
@@ -341,10 +341,11 @@
   (reify
     rs/UpdateEvent
     (-apply-update [_ state]
-      (let [selected (get-in state [:workspace :selected])]
-        (if (contains? selected id)
-          (update-in state [:workspace :selected] disj id)
-          (update-in state [:workspace :selected] conj id))))))
+      (let [selected (get-in state [:workspace :selected])
+            state (if (contains? selected id)
+                    (update-in state [:workspace :selected] disj id)
+                    (update-in state [:workspace :selected] conj id))]
+        (update-in state [:workspace :flags] conj :element-options)))))
 
 ;; --- Select Shapes