diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 2a4f12c4d4..6b3cb5281f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1172,7 +1172,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             var tinyMceRect = editor.editorContainer.getBoundingClientRect();
             var tinyMceTop = tinyMceRect.top;
             var tinyMceBottom = tinyMceRect.bottom;
-            var tinyMceWidth = tinyMceRect.width;
 
             var tinyMceEditArea = tinyMce.find(".mce-edit-area");
 
@@ -1184,15 +1183,13 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     .css("visibility", "visible")
                     .css("position", "fixed")
                     .css("top", "177px")
-                    .css("margin-top", "0")
-                    .css("width", tinyMceWidth);
+                    .css("margin-top", "0");
             } else {
                 toolbar
                     .css("visibility", "visible")
                     .css("position", "absolute")
                     .css("top", "auto")
-                    .css("margin-top", "0")
-                    .css("width", tinyMceWidth);
+                    .css("margin-top", "0");
             }
 
         },
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 852f4411d5..d8df0332ec 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -657,6 +657,8 @@
 // had to overwrite defaults from TinyMCE, needed for buttons panel to float to new line in narrow space.
 .umb-grid .mce-container > div {
     white-space: normal;
+    left:0;
+    right:0;
 }