diff --git a/src/uxbox/view/ui/viewer/shapes.cljs b/src/uxbox/view/ui/viewer/shapes.cljs
index c1965205a6..4e4a47139f 100644
--- a/src/uxbox/view/ui/viewer/shapes.cljs
+++ b/src/uxbox/view/ui/viewer/shapes.cljs
@@ -6,8 +6,10 @@
 
 (ns uxbox.view.ui.viewer.shapes
   (:require [goog.events :as events]
+            [lentes.core :as l]
             [uxbox.util.mixins :as mx :include-macros true]
             [uxbox.main.state :as st]
+            [uxbox.main.geom :as geom]
             [uxbox.main.ui.shapes.rect :refer (rect-shape)]
             [uxbox.main.ui.shapes.icon :refer (icon-shape)]
             [uxbox.main.ui.shapes.text :refer (text-shape)]
@@ -17,6 +19,10 @@
             [uxbox.view.ui.viewer.interactions :as itx])
   (:import goog.events.EventType))
 
+(def itx-flag-ref
+  (-> (comp (l/key :flags) (l/lens :interactions))
+      (l/derive st/state)))
+
 ;; --- Interactions Wrapper
 
 (defn- interactions-wrapper-did-mount
@@ -38,9 +44,18 @@
 
 (mx/defc interactions-wrapper
   {:did-mount interactions-wrapper-did-mount
-   :will-unmount interactions-wrapper-will-unmount}
+   :will-unmount interactions-wrapper-will-unmount
+   :mixins [mx/reactive mx/static]}
   [shape factory]
-  [:g {:id (str "itx-" (:id shape))} (factory shape)])
+  (let [show-itx? (mx/react itx-flag-ref)
+        rect (geom/inner-rect shape)]
+    [:g {:id (str "itx-" (:id shape))}
+     (factory shape)
+     (when show-itx?
+       [:circle {:fill "red"
+                 :cx (:x rect)
+                 :cy (:y rect)
+                 :r 10}])]))
 
 ;; --- Shapes