diff --git a/src/main/frontend/components/property/value.cljs b/src/main/frontend/components/property/value.cljs
index 9a06b9ecad..ed3fce029b 100644
--- a/src/main/frontend/components/property/value.cljs
+++ b/src/main/frontend/components/property/value.cljs
@@ -1158,6 +1158,7 @@
     (if editing?
       (popup-content nil)
       (let [show! (fn [e]
+                    (util/stop e)
                     (let [target (when e (.-target e))]
                       (when-not (or config/publishing?
                                     (util/shift-key? e)
diff --git a/src/main/frontend/components/views.cljs b/src/main/frontend/components/views.cljs
index cf1fa0e2d8..59d321c333 100644
--- a/src/main/frontend/components/views.cljs
+++ b/src/main/frontend/components/views.cljs
@@ -757,7 +757,9 @@
      (assoc cell-opts
             :tabIndex 0
             :ref *ref
-            :on-click (fn [] (click-cell (rum/deref *ref)))
+            :on-click (fn [e]
+                        (when-not (dom/has-class? (.-target e) "jtrigger")
+                          (click-cell (rum/deref *ref))))
             :on-key-down (fn [e]
                            (let [container (rum/deref *ref)]
                              (case (util/ekey e)