diff --git a/eyebrowse.el b/eyebrowse.el
index 798aea6..93feffb 100644
--- a/eyebrowse.el
+++ b/eyebrowse.el
@@ -432,7 +432,7 @@ is detected, it will bind gt, gT, gc and zx, too."
     (define-key map (kbd "C->") 'eyebrowse-next-window-config)
     (define-key map (kbd "C-'") 'eyebrowse-last-window-config)
     (define-key map (kbd "C-\"") 'eyebrowse-close-window-config)
-    (when (and (boundp 'evil-mode) evil-mode)
+    (when (bound-and-true-p evil-mode)
       (define-key evil-motion-state-map (kbd "gt")
         'eyebrowse-next-window-config)
       (define-key evil-motion-state-map (kbd "gT")