diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 5d55889f27..e144ed7312 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -154,7 +154,7 @@
 
         on-frame-enter    (actions/on-frame-enter frame-hover)
         on-frame-leave    (actions/on-frame-leave frame-hover)
-        on-frame-select   (actions/on-frame-select selected)
+        on-frame-select   (actions/on-frame-select selected workspace-read-only?)
 
         disable-events?          (contains? layout :comments)
         show-comments?           (= drawing-tool :comments)
diff --git a/frontend/src/app/main/ui/workspace/viewport/actions.cljs b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
index 4316ee8559..70a66fd226 100644
--- a/frontend/src/app/main/ui/workspace/viewport/actions.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
@@ -125,16 +125,16 @@
            (st/emit! (dw/start-move-selected))))))))
 
 (defn on-frame-select
-  [selected]
+  [selected workspace-read-only?]
   (mf/use-callback
-   (mf/deps selected)
+   (mf/deps selected workspace-read-only?)
    (fn [event id]
      (let [shift? (kbd/shift? event)
            selected? (contains? selected id)
            selected-drawtool (deref refs/selected-drawing-tool)]
        (st/emit! (when (or shift? (not selected?))
                    (dw/select-shape id shift?))
-                 (when (and (nil? selected-drawtool) (not shift?))
+                 (when (and (nil? selected-drawtool) (not shift?) (not workspace-read-only?))
                    (dw/start-move-selected)))))))
 
 (defn on-frame-enter
diff --git a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
index 8e6fae8f13..e57d682561 100644
--- a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
@@ -97,8 +97,7 @@
              (when (= 1 (.-which event))
                (dom/prevent-default event)
                (dom/stop-propagation event)
-               (when-not workspace-read-only?
-                 (on-frame-select event (:id frame)))))))
+                 (on-frame-select event (:id frame))))))
 
         on-double-click
         (mf/use-callback