diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs
index 9cbc8e0d1..e2f1b9225 100644
--- a/frontend/src/uxbox/main/data/workspace.cljs
+++ b/frontend/src/uxbox/main/data/workspace.cljs
@@ -468,8 +468,9 @@
         (rx/concat
          (rx/of (dwc/commit-changes [rchange] [uchange] {:commit-local? true})
                 (dws/select-shapes (d/ordered-set id)))
-         (->> (rx/of (start-edition-mode id))
-              (rx/observe-on :async)))))))
+         (when (= :text (:type attrs))
+           (->> (rx/of (start-edition-mode id))
+                (rx/observe-on :async))))))))
 
 (defn- calculate-centered-box
   [state aspect-ratio]