diff --git a/package.json b/package.json
index 21ee1f60c..d475bb76b 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "aws-sdk": "^2.48.0",
     "aws-sdk-mobile-analytics": "^0.9.2",
     "chart.js": "^2.7.2",
-    "codemirror": "^5.40.2",
+    "codemirror": "^5.58.2",
     "codemirror-mode-elixir": "^1.1.1",
     "command-exists": "^1.2.9",
     "connected-react-router": "^6.4.0",
diff --git a/yarn.lock b/yarn.lock
index df0fdf702..b6f80e328 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1869,13 +1869,10 @@ codemirror-mode-elixir@^1.1.1:
   dependencies:
     codemirror "^5.20.2"
 
-codemirror@^5.18.2, codemirror@^5.20.2:
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.38.0.tgz#26a9551446e51dbdde36aabe60f72469724fd332"
-
-codemirror@^5.40.2:
-  version "5.40.2"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.40.2.tgz#f4a41fee2d84e679543591b3680af259d903330b"
+codemirror@^5.18.2, codemirror@^5.20.2, codemirror@^5.58.2:
+  version "5.58.2"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.58.2.tgz#ed54a1796de1498688bea1cdd4e9eeb187565d1b"
+  integrity sha512-K/hOh24cCwRutd1Mk3uLtjWzNISOkm4fvXiMO7LucCrqbh6aJDdtqUziim3MZUI6wOY0rvY1SlL1Ork01uMy6w==
 
 coffee-script@^1.10.0, coffee-script@^1.12.4:
   version "1.12.7"