diff --git a/CHANGES.md b/CHANGES.md
index c44241f99..c5b86f334 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -54,6 +54,7 @@
 - Fix problem with team management in dashboard [Taiga #1475](https://tree.taiga.io/project/penpot/issue/1475)
 - Fix problem with blending modes in masks [Taiga #1476](https://tree.taiga.io/project/penpot/issue/1476)
 - Fix text selection in comments [#745](https://github.com/penpot/penpot/issues/745)
+- Fix problem with blocked shapes [Taiga #1480](https://tree.taiga.io/project/penpot/issue/1480)
 
 ### :arrow_up: Deps updates
 
diff --git a/frontend/src/app/worker/selection.cljs b/frontend/src/app/worker/selection.cljs
index 425ae2bd0..cba546625 100644
--- a/frontend/src/app/worker/selection.cljs
+++ b/frontend/src/app/worker/selection.cljs
@@ -54,6 +54,7 @@
           match-criteria?
           (fn [shape]
             (and (not (:hidden shape))
+                 (not (:blocked shape))
                  (or (not frame-id) (= frame-id (:frame-id shape)))
                  (case (:type shape)
                    :frame   include-frames?