diff --git a/assets/manifest.json b/assets/manifest.json
index de917dc510..abf01a339b 100644
--- a/assets/manifest.json
+++ b/assets/manifest.json
@@ -12,11 +12,6 @@
       ],
       "main": true
     },
-    "editor-style.css": {
-      "files": [
-        "styles/editor-style.scss"
-      ]
-    },
     "jquery.js": {
       "bower": ["jquery"]
     }
diff --git a/assets/styles/editor-style.scss b/assets/styles/layouts/_tinymce.scss
similarity index 54%
rename from assets/styles/editor-style.scss
rename to assets/styles/layouts/_tinymce.scss
index b318c99e78..7a91799444 100644
--- a/assets/styles/editor-style.scss
+++ b/assets/styles/layouts/_tinymce.scss
@@ -1,5 +1,3 @@
-@import "main";
-
-body {
+body#tinymce {
   margin: 12px !important;
 }
diff --git a/assets/styles/main.scss b/assets/styles/main.scss
index 9fc71134d2..0d51262e28 100644
--- a/assets/styles/main.scss
+++ b/assets/styles/main.scss
@@ -16,3 +16,4 @@
 @import "layouts/_footer";
 @import "layouts/_pages";
 @import "layouts/_posts";
+@import "layouts/_tinymce";
diff --git a/lib/setup.php b/lib/setup.php
index a534e9291c..992e0a3c96 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -45,7 +45,7 @@ function setup() {
   add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery', 'search-form']);
 
   // Custom stylesheet for visual editor
-  add_editor_style(Assets\asset_path('styles/editor-style.css'));
+  add_editor_style(Assets\asset_path('styles/main.css'));
 }
 add_action('after_setup_theme', __NAMESPACE__ . '\\setup');