diff --git a/client/styles/colors.scss b/client/styles/colors.scss
index 84b845da..98d8713d 100644
--- a/client/styles/colors.scss
+++ b/client/styles/colors.scss
@@ -120,6 +120,7 @@
   border-radius: 0.5em;
   padding: 0.2em 0.5em;
   font-size: 0.9em;
+  white-space: nowrap;
 
   &:hover {
     background-color: var(--hover-background-color);
diff --git a/client/styles/editor.scss b/client/styles/editor.scss
index 5de90551..025bf17b 100644
--- a/client/styles/editor.scss
+++ b/client/styles/editor.scss
@@ -636,6 +636,7 @@
     button {
       font-family: var(--editor-font);
       font-size: inherit;
+      white-space: nowrap;
     }
 
     // Only show the button bar on hover on non-touch devices