diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 49b701dda..d70e0cb3c 100644
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -158,8 +158,8 @@
   .tabs {
     display: block;
     border-right: 1px solid #DDD;
-    width: 54px;
-    flex: 0;
+    width: 48px;
+    flex: 0 1 auto;
   }
   .tabs i {
     color: rgba(0, 0, 0, 0.5);
diff --git a/resources/assets/sass/_tinymce.scss b/resources/assets/sass/_tinymce.scss
index dd0bf7950..969bbc968 100644
--- a/resources/assets/sass/_tinymce.scss
+++ b/resources/assets/sass/_tinymce.scss
@@ -25,20 +25,21 @@
 }
 
 .edit-area.flex > div > .mce-tinymce.mce-container.mce-panel {
-  height: 100%;
-  max-height: 100%;
-  flex: 1;
+  flex: 1 1 auto;
   display: flex !important;
   flex-direction: column;
   align-items: stretch;
   margin: 0 -1px;
   > .mce-container-body {
-    flex: 1;
+    flex: 1 1 auto;
     display: flex !important;
     flex-direction: column;
     align-items: stretch;
+    > .mce-toolbar-grp {
+      flex: 0 1 auto;
+    }
     > .mce-edit-area {
-      flex: 1;
+      flex: 1 1 auto;
       display: flex !important;
       flex-direction: column;
       align-items: stretch;