diff --git a/src/wp-admin/css/wp-admin.css b/src/wp-admin/css/wp-admin.css
index b50b716a5a..153042d27a 100644
--- a/src/wp-admin/css/wp-admin.css
+++ b/src/wp-admin/css/wp-admin.css
@@ -10906,7 +10906,6 @@ li#wp-admin-bar-toggle-button {
 
 	#wpwrap {
 		background: #f0f0f0;
-		overflow-x: hidden;
 	}
 
 	#wpcontent, .auto-fold #wpcontent {
@@ -10916,7 +10915,7 @@ li#wp-admin-bar-toggle-button {
 	}
 
 	.wrap {
-		margin-right: 10px;
+		margin-right: 12px;
 		margin-left: 0;
 	}
 
@@ -12257,4 +12256,9 @@ li#wp-admin-bar-toggle-button {
 		height: 100%;
 		z-index: 400;
 	}
+	
+	/* Keep full-width boxes on Edit Post page from causing horizontal scroll */
+	div#post-body.metabox-holder.columns-1 {
+		overflow-x: hidden;
+	}
 }
diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index 6eb25bf98b..7661764260 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -838,6 +838,7 @@
 		text-indent: 100%;
 		width: 28px;
 		padding: 0 10px;
+		overflow: hidden; /* Prevent link text from forcing horizontal scrolling on mobile */
 	}
 
 	#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {