diff --git a/assets/ckeditor/html_label.js b/assets/ckeditor/html_label.js
index fa7966b6..8d847f11 100644
--- a/assets/ckeditor/html_label.js
+++ b/assets/ckeditor/html_label.js
@@ -129,7 +129,6 @@ Editor.builtinPlugins = [
 Editor.defaultConfig = {
     toolbar: {
         items: [
-            'partdb_label',
             'heading',
             'alignment',
             '|',
@@ -168,7 +167,10 @@ Editor.defaultConfig = {
             'redo',
             'findAndReplace',
             'sourceEditing',
-        ]
+            '|',
+            'partdb_label',
+        ],
+        shouldNotGroupWhenFull: true
     },
     language: 'en',
     image: {
diff --git a/assets/ckeditor/markdown_full.js b/assets/ckeditor/markdown_full.js
index 3da6f34e..cdf3a292 100644
--- a/assets/ckeditor/markdown_full.js
+++ b/assets/ckeditor/markdown_full.js
@@ -162,7 +162,8 @@ Editor.defaultConfig = {
             'redo',
             'findAndReplace',
             'sourceEditing',
-        ]
+        ],
+        shouldNotGroupWhenFull: true
     },
     language: 'en',
     image: {