diff --git a/plugins/woocommerce-admin/client/layout/style.scss b/plugins/woocommerce-admin/client/layout/style.scss
index 595f8f813f6..382a3634ab1 100644
--- a/plugins/woocommerce-admin/client/layout/style.scss
+++ b/plugins/woocommerce-admin/client/layout/style.scss
@@ -45,13 +45,8 @@
 .woocommerce-admin-full-screen {
 	background: $studio-gray-0;
 	color: $studio-gray-60;
-	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell,
-		'Helvetica Neue', sans-serif;
-
-	margin-top: -$adminbar-height;
-	@include breakpoint( '<600px' ) {
-		margin-top: -$adminbar-height-mobile;
-	}
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+		Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
 
 	#wpwrap {
 		top: 0;
@@ -82,6 +77,19 @@
 			margin-top: 0 !important;
 		}
 	}
+
+	&.has-woocommerce-navigation {
+		#wpbody {
+			padding-left: 0;
+		}
+	}
+}
+
+.wp-toolbar .woocommerce-admin-full-screen {
+	margin-top: -$adminbar-height;
+	@include breakpoint( '<600px' ) {
+		margin-top: -$adminbar-height-mobile;
+	}
 }
 
 .woocommerce-onboarding {