diff --git a/CHANGES.md b/CHANGES.md
index 75cffe960..398472818 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,7 @@
 - Prevent deleting or moving the drafts project [Taiga #1935](https://tree.taiga.io/project/penpot/issue/1935).
 - Fix problem with zoom and selection [Taiga #1919](https://tree.taiga.io/project/penpot/issue/1919)
 - Fix problem with borders on shape export [#1092](https://github.com/penpot/penpot/issues/1092)
+- Fix thumbnail cropping issue [#Taiga 1964](https://tree.taiga.io/project/penpot/issue/1964)
 
 ### :arrow_up: Deps updates
 ### :boom: Breaking changes
diff --git a/frontend/src/app/main/exports.cljs b/frontend/src/app/main/exports.cljs
index d7310540d..0370f0b1d 100644
--- a/frontend/src/app/main/exports.cljs
+++ b/frontend/src/app/main/exports.cljs
@@ -44,7 +44,8 @@
 
 (defn- calculate-dimensions
   [{:keys [objects] :as data} vport]
-  (let [shapes (cp/select-toplevel-shapes objects {:include-frames? true})
+  (let [shapes (cp/select-toplevel-shapes objects {:include-frames? true
+                                                   :include-frame-children? false})
         to-finite (fn [val fallback] (if (not (mth/finite? val)) fallback val))
         rect (cond->> (gsh/selection-rect shapes)
                (some? vport)