diff --git a/core/core-evilify-keymap.el b/core/core-evilify-keymap.el
index 86665d004..487494ed1 100644
--- a/core/core-evilify-keymap.el
+++ b/core/core-evilify-keymap.el
@@ -182,12 +182,13 @@ Each pair KEYn FUNCTIONn is defined in MAP after the evilification of it."
 (defun spacemacs//evilify-wrapper (map map-symbol map-value event
                                        evil-value evil-event)
   "Define a wrapper for the passed event."
-  (eval `(defun ,(spacemacs//evilify-wrapper-name
+  (eval `(evil-define-command ,(spacemacs//evilify-wrapper-name
                   map-symbol map-value event evil-value evil-event) ()
            ,(spacemacs//evilify-wrapper-documentation
              map-value event evil-value evil-event)
+           :keep-visual t
            (interactive)
-           (if (eq 'evilified evil-state)
+           (if (memq evil-state '(evilified visual))
                ;; evilified state
                ,(if evil-value
                    (spacemacs//evilify-call evil-value event)