diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 08b00882c..5564192ec 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -46,7 +46,8 @@
                 (doom-lookup-key (kbd "TAB") overriding-terminal-local-map))
             cmd)
            ,@(when (modulep! :editor snippets)
-               '(((+yas-active-p)
+               '(((memq (bound-and-true-p yas--active-field-overlay)
+                        (overlays-in (1- (point)) (1+ (point))))
                   #'yas-next-field-or-maybe-expand)
                  ((yas-maybe-expand-abbrev-key-filter 'yas-expand)
                   #'yas-expand)))