diff --git a/evil-lisp-state.el b/evil-lisp-state.el
index d3db878..c928589 100644
--- a/evil-lisp-state.el
+++ b/evil-lisp-state.el
@@ -154,7 +154,7 @@ If `evil-lisp-state-global' is non nil then this variable has no effect."
     `(progn
        (defun ,funcname ()
         (interactive)
-        (when evil-lisp-state-enter-lisp-state-on-command
+        (when (and evil-state evil-lisp-state-enter-lisp-state-on-command)
           (evil-lisp-state))
         (call-interactively ',command))
        ',funcname)))