diff --git a/packages/edit-post/src/components/visual-editor/index.js b/packages/edit-post/src/components/visual-editor/index.js
index aaa75900f89c8..b2dd1f647a078 100644
--- a/packages/edit-post/src/components/visual-editor/index.js
+++ b/packages/edit-post/src/components/visual-editor/index.js
@@ -60,7 +60,7 @@ function MaybeIframe( { children, contentRef, isTemplateMode, styles } ) {
 			head={ <EditorStyles styles={ styles } /> }
 			ref={ ref }
 			contentRef={ contentRef }
-			style={ { width: '100%', height: '100%' } }
+			style={ { width: '100%', height: '100%', display: 'block' } }
 		>
 			{ children }
 		</Iframe>
@@ -113,7 +113,10 @@ export default function VisualEditor( { styles } ) {
 		? templateModeStyles
 		: desktopCanvasStyles;
 	if ( resizedCanvasStyles ) {
-		animatedStyles = resizedCanvasStyles;
+		animatedStyles = {
+			...resizedCanvasStyles,
+			paddingBottom: null,
+		};
 	}
 
 	const contentRef = useMergeRefs( [
diff --git a/packages/edit-post/src/store/selectors.js b/packages/edit-post/src/store/selectors.js
index eece40da2f56c..a1db999ea1266 100644
--- a/packages/edit-post/src/store/selectors.js
+++ b/packages/edit-post/src/store/selectors.js
@@ -313,7 +313,7 @@ export function isSavingMetaBoxes( state ) {
  * @return {string} Device type.
  */
 export function __experimentalGetPreviewDeviceType( state ) {
-	return state.isEditingTemplate ? 'Desktop' : state.deviceType;
+	return state.deviceType;
 }
 
 /**