diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index ff5ba2a52..e017b6362 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -846,8 +846,8 @@
               :text
               (rx/of (dwe/start-edition-mode id))
 
-              (:group :bool)
-              (rx/of (dws/select-shapes (into (d/ordered-set) [(last shapes)])))
+              (:group :bool :frame)
+              (rx/of (dws/select-shapes (into (d/ordered-set) shapes)))
 
               :svg-raw
               nil