diff --git a/common/app/common/pages.cljc b/common/app/common/pages.cljc
index bbc535f577..2cd0ebf200 100644
--- a/common/app/common/pages.cljc
+++ b/common/app/common/pages.cljc
@@ -736,7 +736,10 @@
                                      (assoc :modifiers
                                             (rotation-modifiers gcenter % (- (:rotation group 0))))
                                      (geom/transform-shape))))
-                  selrect (-> (into [] gxfm (:shapes group))
+                  inner-shapes (if (:masked-group? group)
+                                 [(first (:shapes group))]
+                                 (:shapes group))
+                  selrect (-> (into [] gxfm inner-shapes)
                               (geom/selection-rect))]
 
               ;; Rotate the group shape change the data and rotate back again
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index 6317bce611..65b7a8823d 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -1450,13 +1450,16 @@
                   [(first shapes) [] []]
                   (dws/prepare-create-group page-id shapes "Group-" true))
 
-                rchanges (conj rchanges
-                          {:type :mod-obj
-                           :page-id page-id
-                           :id (:id group)
-                           :operations [{:type :set
-                                         :attr :masked-group?
-                                         :val true}]})
+                rchanges (d/concat rchanges
+                          [{:type :mod-obj
+                            :page-id page-id
+                            :id (:id group)
+                            :operations [{:type :set
+                                          :attr :masked-group?
+                                          :val true}]}
+                           {:type :reg-objects
+                            :page-id page-id
+                            :shapes [(:id group)]}])
 
                 uchanges (conj rchanges
                           {:type :mod-obj