diff --git a/resources/assets/javascripts/chunks/wysiwyg.js b/resources/assets/javascripts/chunks/wysiwyg.js
index a1517519991377688392c519d195a69fa8817fea..2d1e7539d09ef673e0bbe66735bca00b7c6fe045 100644
--- a/resources/assets/javascripts/chunks/wysiwyg.js
+++ b/resources/assets/javascripts/chunks/wysiwyg.js
@@ -155,8 +155,6 @@ ClassicEditor.defaultConfig = {
             'codeBlock',
             'math',
             'studip-wiki',
-            '|',
-            'sourceEditing',
             '-',
             'heading',
             '|',
@@ -184,6 +182,8 @@ ClassicEditor.defaultConfig = {
             'indent',
             '|',
             'open-a11y-dialog',
+            '|',
+            'sourceEditing',
         ],
         shouldNotGroupWhenFull: true,
     },
diff --git a/resources/assets/stylesheets/studip-cke-ui.css b/resources/assets/stylesheets/studip-cke-ui.css
index 77701954dc65b35fa3e4fc4fcd7fb14ff6e7cd5a..8f27f8aac63c34eec33b955ac145bf2b270fd31d 100644
--- a/resources/assets/stylesheets/studip-cke-ui.css
+++ b/resources/assets/stylesheets/studip-cke-ui.css
@@ -383,3 +383,8 @@ form.default .ck-source-editing-area textarea {
 #forum .ck form {
     display: inherit;
 }
+
+/* toolbar fix for dialogs */
+.ck.ck-toolbar > .ck-toolbar__items {
+    max-width: calc(100% - 20px);
+}