diff --git a/packages/gatsby-plugin-netlify-cms/src/cms.js b/packages/gatsby-plugin-netlify-cms/src/cms.js
index 439813a477ac3..1697653d55309 100644
--- a/packages/gatsby-plugin-netlify-cms/src/cms.js
+++ b/packages/gatsby-plugin-netlify-cms/src/cms.js
@@ -12,7 +12,20 @@ if (!CMS_MANUAL_INIT) {
   )
 }
 
-/**
- * The stylesheet output from the modules at `modulePath` will be at `cms.css`.
- */
-CMS.registerPreviewStyle(`cms.css`)
+// eslint-disable-next-line no-undef
+if (PRODUCTION) {
+  /**
+   * The stylesheet output from the modules at `modulePath` will be at `cms.css`.
+   */
+  CMS.registerPreviewStyle(`cms.css`)
+} else {
+  /**
+   * In development styles are injected dynamically via the style-loader plugin
+   */
+  window.addEventListener(`DOMContentLoaded`, event => {
+    const list = document.querySelectorAll(`link[rel='stylesheet']`)
+    list.forEach(({ href }) => {
+      CMS.registerPreviewStyle(href)
+    })
+  })
+}
diff --git a/packages/gatsby-plugin-netlify-cms/src/gatsby-node.js b/packages/gatsby-plugin-netlify-cms/src/gatsby-node.js
index 7a2cb2263fc33..f8512662a4057 100644
--- a/packages/gatsby-plugin-netlify-cms/src/gatsby-node.js
+++ b/packages/gatsby-plugin-netlify-cms/src/gatsby-node.js
@@ -49,19 +49,6 @@ function replaceRule(value) {
     return null
   }
 
-  // Manually swap `style-loader` for `MiniCssExtractPlugin.loader`.
-  // `style-loader` is only used in development, and doesn't allow us to pass
-  // the `styles` entry css path to Netlify CMS.
-  if (
-    typeof value.loader === `string` &&
-    value.loader.includes(`style-loader`)
-  ) {
-    return {
-      ...value,
-      loader: MiniCssExtractPlugin.loader,
-    }
-  }
-
   return value
 }
 
@@ -187,9 +174,10 @@ exports.onCreateWebpackConfig = (
 
       // Use a simple filename with no hash so we can access from source by
       // path.
-      new MiniCssExtractPlugin({
-        filename: `[name].css`,
-      }),
+      stage !== `develop` &&
+        new MiniCssExtractPlugin({
+          filename: `[name].css`,
+        }),
 
       // Auto generate CMS index.html page.
       new HtmlWebpackPlugin({
@@ -238,6 +226,7 @@ exports.onCreateWebpackConfig = (
 
       new webpack.DefinePlugin({
         CMS_MANUAL_INIT: JSON.stringify(manualInit),
+        PRODUCTION: JSON.stringify(stage !== `develop`),
       }),
     ].filter(p => p),