diff --git a/resources/assets/javascripts/cke/classic-editor.js b/resources/assets/javascripts/cke/classic-editor.js
index 53154c321dbfdf6e86986e3907de73d335641d27..0e21c0a21ab7d906e628000ad3358c127655a61c 100644
--- a/resources/assets/javascripts/cke/classic-editor.js
+++ b/resources/assets/javascripts/cke/classic-editor.js
@@ -54,7 +54,7 @@ ClassicEditor.defaultConfig = {
             '|',
             'sourceEditing',
         ],
-        shouldNotGroupWhenFull: true,
+        shouldNotGroupWhenFull: false,
     },
 };
 
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index fe376dbbb163cb8e54d4fdca234a929615363b7e..71c4f1cf6b396983840a8a879e541e9b05b3b68a 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -172,6 +172,7 @@ form.default {
         box-sizing: border-box;
         border: solid 1px $content-color-40;
         margin: 0 0 10px;
+        min-width: auto;
         padding: $gap 10px 10px;
 
         > legend {
diff --git a/resources/assets/stylesheets/scss/studip-cke-ui.scss b/resources/assets/stylesheets/scss/studip-cke-ui.scss
index 5e28678235e48080753e67682f5e3ede18c3bfe3..05497aa0863e3fd51de1b30193de2dceb687bf90 100644
--- a/resources/assets/stylesheets/scss/studip-cke-ui.scss
+++ b/resources/assets/stylesheets/scss/studip-cke-ui.scss
@@ -71,8 +71,8 @@
 .ck.ck-icon, .ck.ck-icon * {
     color: var(--base-color);
 }
-.ck.ck-button.ck-on:not(.ck-dropdown__button) .ck.ck-icon,
-.ck.ck-button.ck-on:not(.ck-dropdown__button) .ck.ck-icon *,
+.ck.ck-button.ck-on .ck.ck-icon,
+.ck.ck-button.ck-on .ck.ck-icon *,
 .ck.ck-button:not(.ck-dropdown__button.ck-button_with-text):not(.ck-disabled):hover .ck.ck-icon,
 .ck.ck-button:not(.ck-dropdown__button.ck-button_with-text):not(.ck-disabled):hover .ck.ck-icon * {
     color: var(--white);
@@ -112,9 +112,7 @@
 .ck.ck-button.ck-off.ck-button_with-text:hover {
     background-color: var(--base-color);
 }
-.ck.ck-button.ck-on.ck-dropdown__button,
-.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover,
-a.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
+.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
     background-color: var(--white);
     color: var(--base-color);
 }
@@ -414,16 +412,18 @@ form.default .ck-source-editing-area textarea {
 .ck.ck-toolbar {
     background-color: var(--dark-gray-color-5);
 }
-/* toolbar fix for dialogs */
-.ck.ck-toolbar > .ck-toolbar__items {
-    max-width: calc(100% - 20px);
-}
 
 /* tooltip fix for balloon panel */
 .ck.ck-balloon-panel.ck-tooltip {
     padding: 0;
 }
 
+.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sw {
+    right: -5px;
+    top: calc(100% + 4px);
+}
+
+/* toolbar fix for dialogs */
 .studip-dialog {
     .ck-editor {
         overflow: hidden;
@@ -433,6 +433,15 @@ form.default .ck-source-editing-area textarea {
         }
     }
 }
+
+form.default textarea:not(.size-l) + .ck-editor {
+    .ck-toolbar__grouped-dropdown {
+        .ck-toolbar {
+            max-width: calc(48em - 2px);
+        }
+    }
+}
+
 /* balloon editor button*/
 .ck.ck-block-toolbar-button {
     background-color: var(--dark-gray-color-5);