diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index 5ccc76177188c..23d292e455c89 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -101,6 +101,26 @@ html:lang(he-il) .rtl #wpadminbar * {
 	outline: 1px solid transparent;
 }
 
+#wpadminbar,
+#wpadminbar #wp-toolbar,
+#wpadminbar #wp-toolbar > ul,
+#wpadminbar .ab-top-menu {
+	display: flex;
+	flex-wrap: nowrap;
+}
+
+#wpadminbar #wp-toolbar {
+	justify-content: space-between;
+	width: 100%;
+}
+
+#wpadminbar #wp-toolbar > ul > li > .ab-item {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	min-width: 16px;
+	overflow: hidden;
+}
+
 #wpadminbar .ab-sub-wrapper,
 #wpadminbar ul,
 #wpadminbar ul li {
@@ -122,10 +142,6 @@ html:lang(he-il) .rtl #wpadminbar * {
 	text-align: left;
 }
 
-#wpadminbar li {
-	float: left;
-}
-
 #wpadminbar .ab-empty-item {
 	outline: none;
 }
@@ -374,10 +390,6 @@ html:lang(he-il) .rtl #wpadminbar * {
 	color: #000;
 }
 
-#wpadminbar .ab-top-secondary {
-	float: right;
-}
-
 #wpadminbar ul li:last-child,
 #wpadminbar ul li:last-child .ab-item {
 	box-shadow: none;
@@ -845,6 +857,18 @@ html:lang(he-il) .rtl #wpadminbar * {
 		display: none;
 	}
 
+	/* Scrolls any overflow, but hides all dropdowns even when there is no overflow */
+	#wpadminbar {
+		overflow-x: auto;
+		overflow-y: hidden;
+		scrollbar-width: thin;
+	}
+
+	#wpadminbar .ab-sub-wrapper,
+	#wpadminbar .shortlink-input {
+		display: none !important;
+	}
+
 	/* WP logo */
 	#wpadminbar #wp-admin-bar-wp-logo > .ab-item {
 		padding: 0;