diff --git a/package.json b/package.json
index 5f221282..5d446073 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "babel-preset-react": "^6.11.1",
     "bahmni-form-controls": "^0.93.4",
     "classnames": "^2.2.5",
-    "codemirror": "^5.51.0",
+    "codemirror": "^5.58.2",
     "core-js": "^2.4.1",
     "file-saver": "^2.0.2",
     "jshint": "^2.11.0",
diff --git a/yarn.lock b/yarn.lock
index d95d121b..7129bcf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1699,10 +1699,10 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codemirror@^5.51.0:
-  version "5.52.2"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.52.2.tgz#c29e1f7179f85eb0dd17c0586fa810e4838ff584"
-  integrity sha512-WCGCixNUck2HGvY8/ZNI1jYfxPG5cRHv0VjmWuNzbtCLz8qYA5d+je4QhSSCtCaagyeOwMi/HmmPTjBgiTm2lQ==
+codemirror@^5.58.2:
+  version "5.58.2"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.58.2.tgz#ed54a1796de1498688bea1cdd4e9eeb187565d1b"
+  integrity sha512-K/hOh24cCwRutd1Mk3uLtjWzNISOkm4fvXiMO7LucCrqbh6aJDdtqUziim3MZUI6wOY0rvY1SlL1Ork01uMy6w==
 
 collection-visit@^1.0.0:
   version "1.0.0"