diff --git a/ghost/admin/app/components/gh-html-iframe.js b/ghost/admin/app/components/gh-html-iframe.js
index fd29a7a4e5..0b84c24c3f 100644
--- a/ghost/admin/app/components/gh-html-iframe.js
+++ b/ghost/admin/app/components/gh-html-iframe.js
@@ -62,7 +62,14 @@ export default class GhHtmlIframeComponent extends Component {
         window.clearTimeout(this.swapTimeout);
 
         if (this.iframes.indexOf(renderedIframe) !== this.renderedIframe) {
-            this.iframes[this.toRenderIframe].contentDocument.body.scrollTop = this.iframes[this.renderedIframe].contentDocument.body.scrollTop;
+            let newScrollTop = this.iframes[this.renderedIframe].contentDocument.body.scrollTop;
+
+            if (this._lastPageId !== this.args.pageId) {
+                newScrollTop = 0;
+            }
+            this._lastPageId = this.args.pageId;
+
+            this.iframes[this.toRenderIframe].contentDocument.body.scrollTop = newScrollTop;
             this.iframes[this.toRenderIframe].style = this.visibleIframeStyle;
             this.renderedIframe = this.toRenderIframe;
             this.toRenderIframe = this.toRenderIframe === 0 ? 1 : 0;
diff --git a/ghost/admin/app/templates/settings/design/index.hbs b/ghost/admin/app/templates/settings/design/index.hbs
index 96f3eed6b6..e661fc1d18 100644
--- a/ghost/admin/app/templates/settings/design/index.hbs
+++ b/ghost/admin/app/templates/settings/design/index.hbs
@@ -50,7 +50,7 @@
             {{/if}}
             <div class="{{if this.isMobilePreview "gh-pe-mobile-bezel" "gh-browserpreview-iframecontainer"}}">
                 <div class="{{if this.isMobilePreview "gh-pe-mobile-screen"}}">
-                    <GhHtmlIframe class={{if this.isMobilePreview "gh-post-preview-iframe" "site-frame"}} @html={{this.themeManagement.previewHtml}} />
+                    <GhHtmlIframe class={{if this.isMobilePreview "gh-post-preview-iframe" "site-frame"}} @html={{this.themeManagement.previewHtml}} @pageId={{this.themeManagement.previewType}} />
                 </div>
             </div>
         </div>