diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index 0a6aba2ed..9bd6bba8a 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -248,6 +248,12 @@ variable for an explanation of the defaults (in comments). See
   (add-hook 'pre-command-hook #'evil-escape-pre-command-hook)
   (evil-define-key* '(insert replace visual operator) 'global "\C-g" #'evil-escape)
   :config
+  ;; TODO PR this upstream
+  (defun +evil*escape-func (ret)
+    (if (eq evil-state 'multiedit-insert)
+        #'evil-multiedit-state
+      ret))
+  (advice-add #'evil-escape-func :filter-return #'+evil*escape-func)
   ;; no `evil-escape' in minibuffer
   (add-hook 'evil-escape-inhibit-functions #'minibufferp))