diff --git a/src/App.css b/src/App.css
index 71b2b3a4ab..0a048c6a2a 100644
--- a/src/App.css
+++ b/src/App.css
@@ -226,3 +226,18 @@ input[type="checkbox"]:not([disabled]):hover {
   flex-wrap: wrap !important;
   justify-content: flex-start !important;
 }
+
+.tox .tox-split-button {
+  display: flex !important;
+  align-items: center !important;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+.tox .tox-split-button__chevron {
+  display: inline-block !important;
+  min-width: auto !important;
+  width: auto !important;
+  margin-left: -1px !important;
+  padding: 4px !important;
+}
diff --git a/src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx b/src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx
index 59acc3a336..f2bba5780e 100644
--- a/src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx
+++ b/src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx
@@ -53,7 +53,7 @@ const TINY_MCE_INIT_OPTIONS = {
                     styleselect fontsizeselect | table| strikethrough forecolor backcolor |\
                     subscript superscript charmap  | help',
   branding: false,
-  toolbar_mode: 'sliding',
+  toolbar_mode: 'wrap',
   min_height: 180,
   max_height: 300,
   autoresize_bottom_margin: 1,