diff --git a/CHANGES.md b/CHANGES.md
index 8234a616c0..c1917880f1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,7 @@
 - Fix context menu outside screen [Taiga #5524](https://tree.taiga.io/project/penpot/issue/5524)
 - Fix graphic item rename on assets pannel [Taiga #5556](https://tree.taiga.io/project/penpot/issue/5556)
 - Fix component and media name validation on assets panel [Taiga #5555](https://tree.taiga.io/project/penpot/issue/5555)
+- Fix problem with selection shortcuts [Taiga #5492](https://tree.taiga.io/project/penpot/issue/5492)
 
 ### :heart: Community contributions by (Thank you!)
 
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index 966af4fdd2..7043327671 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -938,7 +938,10 @@
               (rx/of (dwe/start-edition-mode id))
 
               (:group :bool :frame)
-              (rx/of (dws/select-shapes (into (d/ordered-set) shapes)))
+              (let [shapes-ids (into (d/ordered-set)
+                                     (remove #(dm/get-in objects [% :hidden]))
+                                     shapes)]
+                (rx/of (dws/select-shapes shapes-ids)))
 
               :svg-raw
               nil
diff --git a/frontend/src/app/main/data/workspace/selection.cljs b/frontend/src/app/main/data/workspace/selection.cljs
index db4dfee10a..9bab204bf7 100644
--- a/frontend/src/app/main/data/workspace/selection.cljs
+++ b/frontend/src/app/main/data/workspace/selection.cljs
@@ -249,7 +249,7 @@
                        (lookup uuid/zero))
 
             toselect (->> (cph/get-immediate-children objects (:id parent))
-                          (into (d/ordered-set) (comp (remove :blocked) (map :id))))]
+                          (into (d/ordered-set) (comp (remove :hidden) (remove :blocked) (map :id))))]
 
         (rx/of (select-shapes toselect))))))