diff --git a/modules/feature/snippets/config.el b/modules/feature/snippets/config.el
index 68c1a9a97..ec8adc255 100644
--- a/modules/feature/snippets/config.el
+++ b/modules/feature/snippets/config.el
@@ -37,7 +37,7 @@
   (advice-add #'yas-expand :before #'sp-remove-active-pair-overlay)
 
   ;; Exit snippets on ESC from normal mode
-  (add-hook '+evil-esc-hook #'yas-exit-all-snippets))
+  (add-hook '+evil-esc-hook #'yas-abort-snippet))
 
 
 (def-package! auto-yasnippet
diff --git a/modules/private/default/+bindings.el b/modules/private/default/+bindings.el
index a525a5a1c..d17193caa 100644
--- a/modules/private/default/+bindings.el
+++ b/modules/private/default/+bindings.el
@@ -603,7 +603,6 @@
           "<M-right>"     #'+snippets/goto-end-of-field
           "<M-left>"      #'+snippets/goto-start-of-field
           "<M-backspace>" #'+snippets/delete-to-start-of-field
-          [escape]        #'evil-normal-state
           [backspace]     #'+snippets/delete-backward-char
           [delete]        #'+snippets/delete-forward-char-or-field)
         (:map yas-minor-mode-map