diff --git a/src/canvas/model/Frame.ts b/src/canvas/model/Frame.ts
index 69c67b617..06d250832 100644
--- a/src/canvas/model/Frame.ts
+++ b/src/canvas/model/Frame.ts
@@ -239,6 +239,16 @@ export default class Frame extends ModuleModel<CanvasModule> {
     this.em.trigger('frame:updated', { frame: this, ...data });
   }
 
+  hasAutoHeight() {
+    const { height } = this.attributes;
+
+    if (height === 'auto' || this.config.infiniteCanvas) {
+      return true;
+    }
+
+    return false;
+  }
+
   toJSON(opts: any = {}) {
     const obj = ModuleModel.prototype.toJSON.call(this, opts);
     const defaults = result(this, 'defaults');
diff --git a/src/canvas/view/FrameView.ts b/src/canvas/view/FrameView.ts
index fc9c30751..6c9331933 100644
--- a/src/canvas/view/FrameView.ts
+++ b/src/canvas/view/FrameView.ts
@@ -363,6 +363,7 @@ export default class FrameView extends ModuleView<Frame, HTMLIFrameElement> {
     const doc = this.getDoc();
     const body = this.getBody();
     const win = this.getWindow();
+    const hasAutoHeight = model.hasAutoHeight();
     const conf = em.config;
     //@ts-ignore This could be used inside component-related scripts to check if the
     // script is executed inside the editor.
@@ -376,8 +377,10 @@ export default class FrameView extends ModuleView<Frame, HTMLIFrameElement> {
       `<style>
       ${conf.baseCss || config.frameStyle || ''}
 
+      ${hasAutoHeight ? 'body { overflow: hidden }' : ''}
+
       [data-gjs-type="wrapper"] {
-        min-height: 100vh;
+        ${!hasAutoHeight ? 'min-height: 100vh;' : ''}
         padding-top: 0.001em;
       }
 
diff --git a/src/canvas/view/FrameWrapView.ts b/src/canvas/view/FrameWrapView.ts
index bedfb8f47..8858002d6 100644
--- a/src/canvas/view/FrameWrapView.ts
+++ b/src/canvas/view/FrameWrapView.ts
@@ -18,6 +18,7 @@ export default class FrameWrapView extends ModuleView<Frame> {
   dragger?: Dragger;
   cv: CanvasView;
   classAnim: string;
+  sizeObserver?: ResizeObserver;
 
   constructor(model: Frame, canvasView: CanvasView) {
     super({ model });
@@ -145,17 +146,6 @@ export default class FrameWrapView extends ModuleView<Frame> {
     const { frame, config } = this;
     frame.getWindow().onscroll = this.onScroll;
     this.updateDim();
-
-    if (this.config.infiniteCanvas) {
-      // const iframe = this.frame.el;
-      // console.log('frameEl', iframe.contentDocument)
-      // const observer = new ResizeObserver(() => {
-      //     // console.log('height', iframe.contentDocument!.body.scrollHeight)
-      //     this.el.style.height = `${iframe.contentDocument!.body.scrollHeight}px`;
-      // })
-      // observer.observe(iframe.contentDocument!.body);
-      // TODO: disable min-height: 100vh;
-    }
   }
 
   __handleSize() {
@@ -168,8 +158,32 @@ export default class FrameWrapView extends ModuleView<Frame> {
     const newW = width || '';
     const newH = height || '';
     const noChanges = currW == newW && currH == newH;
-    style.width = isNumber(newW) ? `${newW}${un}` : newW;
-    style.height = isNumber(newH) ? `${newH}${un}` : newH;
+    const newWidth = isNumber(newW) ? `${newW}${un}` : newW;
+    const newHeight = isNumber(newH) ? `${newH}${un}` : newH;
+    style.width = newWidth;
+
+    if (model.hasAutoHeight()) {
+      const iframe = this.frame.el;
+
+      if (
+        iframe.contentDocument
+        // this doesn't work always
+        // && !this.sizeObserver
+      ) {
+        const { contentDocument } = iframe;
+        const observer = new ResizeObserver(() => {
+          style.height = `${contentDocument.body.scrollHeight}px`;
+        });
+        observer.observe(contentDocument.body);
+        this.sizeObserver?.disconnect();
+        this.sizeObserver = observer;
+      }
+    } else {
+      style.height = newHeight;
+      this.sizeObserver?.disconnect();
+      delete this.sizeObserver;
+    }
+
     return { noChanges, width, height, newW, newH };
   }