diff --git a/core/lib/defuns-yasnippet.el b/core/lib/defuns-yasnippet.el
index 374364ab8..4d409526a 100644
--- a/core/lib/defuns-yasnippet.el
+++ b/core/lib/defuns-yasnippet.el
@@ -27,7 +27,7 @@ normal mode if there are no fields."
   (let* ((snippet (first (yas--snippets-at-point)))
          (fields (yas--snippet-fields snippet)))
     (evil-insert-state +1)
-    (when fields (evil-change-state 'normal))))
+    (unless fields (evil-change-state 'normal))))
 
 ;;;###autoload
 (defun narf/yas-goto-start-of-field ()