diff --git a/skinStyles/extensions/VisualEditor/ext.visualEditor.less b/skinStyles/extensions/VisualEditor/ext.visualEditor.less
index 3a11e75a..0ccb8934 100644
--- a/skinStyles/extensions/VisualEditor/ext.visualEditor.less
+++ b/skinStyles/extensions/VisualEditor/ext.visualEditor.less
@@ -96,7 +96,8 @@
 					}
 
 					.oo-ui-toolbar-tools {
-						display: inline;
+						display: inline-block;
+						white-space: nowrap;
 					}
 
 					/* Fix inline height */
@@ -298,6 +299,20 @@
 		z-index: 4;
 	}
 
+	.skin-citizen {
+		.ve {
+			&-ui {
+				&-toolbar {
+					> .oo-ui-toolbar-bar {
+						.oo-ui-toolbar-tools {
+							display: inline;
+						}
+					}
+				}
+			}
+		}
+	}
+
 	.ve-init-mw-desktopArticleTarget {
 		&-toolbar {
 			&.ve-ui-toolbar-floating > .oo-ui-toolbar-bar {