diff --git a/services/web/frontend/stylesheets/app/editor.less b/services/web/frontend/stylesheets/app/editor.less
index 57397a072e..048b75b5db 100644
--- a/services/web/frontend/stylesheets/app/editor.less
+++ b/services/web/frontend/stylesheets/app/editor.less
@@ -169,17 +169,6 @@
       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 {
diff --git a/services/web/frontend/stylesheets/app/editor/toolbar.less b/services/web/frontend/stylesheets/app/editor/toolbar.less
index 1847107cb0..a4525efe8b 100644
--- a/services/web/frontend/stylesheets/app/editor/toolbar.less
+++ b/services/web/frontend/stylesheets/app/editor/toolbar.less
@@ -340,6 +340,12 @@
   }
 }
 
+.formatting-buttons-cm6-panel {
+  padding-top: 4px;
+  background-color: @formatting-btn-bg;
+  display: flex;
+}
+
 .formatting-btn {
   color: @formatting-btn-color;
   background-color: @formatting-btn-bg;