diff --git a/CHANGES.md b/CHANGES.md
index 5a2145b54..bfc39fe4e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -46,6 +46,7 @@
 - Workspace-palette items stay hidden when opening with keyboard-shortcut [Taiga #7489](https://tree.taiga.io/project/penpot/issue/7489)
 - Fix SVG attrs are not handled correctly when exporting/importing in .zip [Taiga #7920](https://tree.taiga.io/project/penpot/issue/7920)
 - Fix validation error when detaching with two nested copies and a swap [Taiga #8095](https://tree.taiga.io/project/penpot/issue/8095)
+- Export shapes that are rotated act a bit strange when reimported [Taiga #7585](https://tree.taiga.io/project/penpot/issue/7585)
 
 ## 2.0.3
 
diff --git a/common/src/app/common/types/shape.cljc b/common/src/app/common/types/shape.cljc
index a48913329..4f4d8d581 100644
--- a/common/src/app/common/types/shape.cljc
+++ b/common/src/app/common/types/shape.cljc
@@ -471,9 +471,14 @@
 
 (defn setup-rect
   "Initializes the selrect and points for a shape."
-  [{:keys [selrect points] :as shape}]
-  (let [selrect (or selrect (gsh/shape->rect shape))
-        points  (or points  (grc/rect->points selrect))]
+  [{:keys [selrect points transform] :as shape}]
+  (let [selrect   (or selrect (gsh/shape->rect shape))
+        center    (grc/rect->center selrect)
+        transform (or transform (gmt/matrix))
+        points    (or points
+                      (->  selrect
+                           (grc/rect->points)
+                           (gsh/transform-points center transform)))]
     (-> shape
         (assoc :selrect selrect)
         (assoc :points points))))