diff --git a/package-lock.json b/package-lock.json
index 39949fc9..83e2b7a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "GPL-3.0-only",
       "dependencies": {
         "@eight04/draggable-list": "^0.3.0",
-        "codemirror": "5.65.1",
+        "codemirror": "5.65.2",
         "db-to-cloud": "^0.7.0",
         "jsonlint": "^1.6.3",
         "less-bundle": "github:openstyles/less-bundle#v0.1.0",
@@ -23,6 +23,7 @@
       "devDependencies": {
         "archiver": "^4.0.1",
         "eslint": "^7.20.0",
+        "fs-extra": "^9.0.0",
         "glob": "^7.2.0",
         "node-fetch": "^2.6.6",
         "sync-version": "^1.0.1",
@@ -1571,9 +1572,9 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "5.65.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz",
-      "integrity": "sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA=="
+      "version": "5.65.2",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.2.tgz",
+      "integrity": "sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA=="
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
@@ -8622,9 +8623,9 @@
       }
     },
     "codemirror": {
-      "version": "5.65.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz",
-      "integrity": "sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA=="
+      "version": "5.65.2",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.2.tgz",
+      "integrity": "sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA=="
     },
     "color-convert": {
       "version": "1.9.3",
diff --git a/package.json b/package.json
index e53800d1..d9ebff37 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@eight04/draggable-list": "^0.3.0",
-    "codemirror": "5.65.1",
+    "codemirror": "5.65.2",
     "db-to-cloud": "^0.7.0",
     "jsonlint": "^1.6.3",
     "less-bundle": "github:openstyles/less-bundle#v0.1.0",
diff --git a/vendor/codemirror/README.md b/vendor/codemirror/README.md
index aaa6e024..6b81c3be 100644
--- a/vendor/codemirror/README.md
+++ b/vendor/codemirror/README.md
@@ -1,4 +1,4 @@
-## codemirror v5.65.1
+## codemirror v5.65.2
 
 Files copied from NPM (node_modules):
 * addon/comment/comment.js
diff --git a/vendor/codemirror/keymap/vim.js b/vendor/codemirror/keymap/vim.js
index 1cf9636f..b2da1c13 100644
--- a/vendor/codemirror/keymap/vim.js
+++ b/vendor/codemirror/keymap/vim.js
@@ -865,13 +865,17 @@
         }
         function handleEsc() {
           if (key == '<Esc>') {
-            // Clear input state and get back to normal mode.
-            clearInputState(cm);
             if (vim.visualMode) {
+              // Get back to normal mode.
               exitVisualMode(cm);
             } else if (vim.insertMode) {
+              // Get back to normal mode.
               exitInsertMode(cm);
+            } else {
+              // We're already in normal mode. Let '<Esc>' be handled normally.
+              return;
             }
+            clearInputState(cm);
             return true;
           }
         }
diff --git a/vendor/codemirror/lib/codemirror.js b/vendor/codemirror/lib/codemirror.js
index 8686b788..193d445b 100644
--- a/vendor/codemirror/lib/codemirror.js
+++ b/vendor/codemirror/lib/codemirror.js
@@ -9842,7 +9842,7 @@
 
   addLegacyProps(CodeMirror);
 
-  CodeMirror.version = "5.65.1";
+  CodeMirror.version = "5.65.2";
 
   return CodeMirror;