diff --git a/modules/private/hlissner/+bindings.el b/modules/private/hlissner/+bindings.el
index 70d4e9c8d..6c7bf7446 100644
--- a/modules/private/hlissner/+bindings.el
+++ b/modules/private/hlissner/+bindings.el
@@ -280,7 +280,7 @@
      :desc "Indent guides (column)" :n "I" #'highlight-indentation-current-column-mode
      :desc "Impatient mode"         :n "h" #'+present/impatient-mode
      :desc "Big mode"               :n "b" #'+present/big-mode
-     :desc "Evil goggles"           :n "g" #'+evil-goggles/toggle-evil-goggles))
+     :desc "Evil goggles"           :n "g" #'+evil-goggles/toggle))
 
 
  ;; --- Personal vim-esque bindings ------------------
diff --git a/modules/ui/evil-goggles/autoload.el b/modules/ui/evil-goggles/autoload.el
index 71338e060..2913e9074 100644
--- a/modules/ui/evil-goggles/autoload.el
+++ b/modules/ui/evil-goggles/autoload.el
@@ -1,8 +1,8 @@
 ;;; feature/ui/evil-goggles/autoload.el
 
 ;;;###autoload
-(defun +evil-goggles/toggle-evil-goggles ()
-  "Toggle evil goggles mode"
+(defun +evil-goggles/toggle ()
+  "Toggle evil goggles mode."
   (interactive)
   (if evil-goggles-mode
       (evil-goggles-mode -1)
diff --git a/modules/ui/evil-goggles/config.el b/modules/ui/evil-goggles/config.el
index d690ff82f..b8fb36060 100644
--- a/modules/ui/evil-goggles/config.el
+++ b/modules/ui/evil-goggles/config.el
@@ -1,6 +1,10 @@
 ;;; ui/evil-goggles/config.el
 
-(def-package! evil-goggles :demand t
+(def-package! evil-goggles
+  :when (featurep! :feature evil)
+  :commands evil-goggles-mode
+  :init
+  (add-hook 'after-init-hook #'evil-goggles-mode)
   :config
-  (evil-goggles-mode +1)
+  (setq evil-goggles-duration 0.1)
   (evil-goggles-use-diff-faces))
diff --git a/modules/ui/evil-goggles/packages.el b/modules/ui/evil-goggles/packages.el
index 3eec5e307..a4140cf69 100644
--- a/modules/ui/evil-goggles/packages.el
+++ b/modules/ui/evil-goggles/packages.el
@@ -1,4 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/evil-goggles/packages.el
 
-(package! evil-goggles)
+(when (featurep! :feature evil)
+  (package! evil-goggles))