diff --git a/services/web/frontend/stylesheets/app/editor.less b/services/web/frontend/stylesheets/app/editor.less
index 048b75b5db..57397a072e 100644
--- a/services/web/frontend/stylesheets/app/editor.less
+++ b/services/web/frontend/stylesheets/app/editor.less
@@ -169,6 +169,17 @@
       border-radius: @btn-border-radius-base 0 0 @btn-border-radius-base;
     }
   }
+
+  &.toolbar-wrap {
+    min-height: @editor-toolbar-height;
+    height: unset; // Allow to grow if buttons wrap
+    flex-wrap: wrap;
+
+    .formatting-buttons {
+      flex-grow: 1 0 auto;
+      width: unset;
+    }
+  }
 }
 
 .loading-screen {