diff --git a/package-lock.json b/package-lock.json
index 00945c0443..f34c58891b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6579,7 +6579,7 @@
         "apollo-link-ws": "1.0.8",
         "calculate-size": "^1.1.1",
         "codemirror": "^5.38.0",
-        "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix",
+        "codemirror-graphql": "github:timsuchanek/codemirror-graphql#801ec32683c38d6dc0f8f7bc19014a111edc9ebd",
         "copy-to-clipboard": "^3.0.8",
         "cryptiles": "4.1.2",
         "cuid": "^1.3.8",
@@ -9078,7 +9078,6 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
       "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -9088,15 +9087,13 @@
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
           "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
diff --git a/webpack/base.config.js b/webpack/base.config.js
index f2789d5d92..e816b65da4 100644
--- a/webpack/base.config.js
+++ b/webpack/base.config.js
@@ -33,8 +33,8 @@ module.exports = {
       {
         test: /\.js$/,
         exclude: /node_modules/,
-        use: { 
-          loader: 'babel-loader', 
+        use: {
+          loader: 'babel-loader',
           query: {
             plugins: [["@babel/plugin-proposal-decorators", { "legacy": true }], '@babel/transform-regenerator', '@babel/transform-runtime'],
             presets: ['@babel/preset-react', '@babel/preset-env']
@@ -42,8 +42,19 @@ module.exports = {
         },
       }, {
         test: /\.scss$/,
-        use: [ "style-loader", "css-loader?modules&localIdentName=[local]__[hash:base64:5]!sass-loader?includePaths[]=" +
-          encodeURIComponent(path.resolve(__dirname, '../src')) ]
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader',
+            options: {
+              modules: {
+                localIdentName: '[local]__[hash:base64:5]'
+              },
+              importLoaders: 2
+            },
+          },
+          "sass-loader?includePaths[]=" + encodeURIComponent(path.resolve(__dirname, '../src'))
+        ]
       }, {
         test: /\.css$/,
         use: [ 'style-loader', 'css-loader' ]