diff --git a/plugins/woocommerce-admin/client/layout/style.scss b/plugins/woocommerce-admin/client/layout/style.scss
index 3098bcbf0b0..595f8f813f6 100644
--- a/plugins/woocommerce-admin/client/layout/style.scss
+++ b/plugins/woocommerce-admin/client/layout/style.scss
@@ -22,11 +22,6 @@
 	.update-nag {
 		display: none;
 	}
-
-	#wpbody {
-		padding-top: 0;
-		display: block;
-	}
 }
 
 .woocommerce-admin-is-loading {
diff --git a/plugins/woocommerce-admin/client/navigation/style.scss b/plugins/woocommerce-admin/client/navigation/style.scss
index 7dd51a3cdac..51c86705e97 100644
--- a/plugins/woocommerce-admin/client/navigation/style.scss
+++ b/plugins/woocommerce-admin/client/navigation/style.scss
@@ -61,7 +61,7 @@ body.is-wc-nav-folded {
 	}
 
 	#wpbody {
-		margin-left: 0;
+		padding-left: 0;
 	}
 }
 
@@ -94,10 +94,10 @@ body.is-wc-nav-folded {
 	}
 
 	#wpbody {
-		margin-left: $navigation-width;
+		padding-left: $navigation-width;
 
 		@media ( max-width: 960px ) {
-			margin-left: 0;
+			padding-left: 0;
 		}
 	}
 
@@ -114,14 +114,6 @@ body.is-wc-nav-folded {
 				height: $header-height;
 			}
 		}
-
-		.woocommerce-layout__header-heading {
-			margin-left: $navigation-width;
-
-			@include breakpoint( '<960px' ) {
-				margin-left: $header-height;
-			}
-		}
 	}
 
 	#woocommerce-embedded-root.is-embed-loading {
diff --git a/plugins/woocommerce-admin/client/stylesheets/shared/_embed.scss b/plugins/woocommerce-admin/client/stylesheets/shared/_embed.scss
index b6fa9787dc3..4cef2602e69 100644
--- a/plugins/woocommerce-admin/client/stylesheets/shared/_embed.scss
+++ b/plugins/woocommerce-admin/client/stylesheets/shared/_embed.scss
@@ -1,9 +1,4 @@
 .woocommerce-embed-page {
-	#wpbody {
-		margin-top: $header-height;
-		padding-top: 0;
-	}
-
 	#wpbody .woocommerce-layout,
 	.woocommerce-layout__notice-list-hide + .wrap {
 		padding-top: 10px;
diff --git a/plugins/woocommerce-admin/client/stylesheets/shared/_reset.scss b/plugins/woocommerce-admin/client/stylesheets/shared/_reset.scss
index 6c3a5450879..34d91765bb1 100644
--- a/plugins/woocommerce-admin/client/stylesheets/shared/_reset.scss
+++ b/plugins/woocommerce-admin/client/stylesheets/shared/_reset.scss
@@ -43,6 +43,14 @@
 	box-sizing: border-box;
 }
 
+#wpbody {
+	display: inline-block;
+	width: 100%;
+	box-sizing: border-box;
+	padding-top: 0;
+	margin-top: $header-height;
+}
+
 #wpfooter {
 	display: none;
 }