diff --git a/core/core-evil.el b/core/core-evil.el
index 6f249e426..869be92c6 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -327,22 +327,15 @@
   (evilem-define (kbd "g SPC n") 'evil-ex-search-next)
   (evilem-define (kbd "g SPC N") 'evil-ex-search-previous)
   (evilem-define "gs" 'evil-snipe-repeat
-    (lambda ()
-      (save-excursion
-        (ignore-errors
-          (call-interactively #'evil-snipe-s))))
-    nil
-    ((evil-snipe-enable-highlight)
-     (evil-snipe-enable-incremental-highlight)))
-
+    :pre-hook (save-excursion (call-interactively #'evil-snipe-s))
+    :bind ((evil-snipe-scope 'buffer)
+           (evil-snipe-enable-highlight)
+           (evil-snipe-enable-incremental-highlight)))
   (evilem-define "gS" 'evil-snipe-repeat-reverse
-    (lambda ()
-      (save-excursion
-        (ignore-errors
-          (call-interactively #'evil-snipe-s))))
-    nil
-    ((evil-snipe-enable-highlight)
-     (evil-snipe-enable-incremental-highlight))))
+    :pre-hook (save-excursion (call-interactively #'evil-snipe-s))
+    :bind ((evil-snipe-scope 'buffer)
+           (evil-snipe-enable-highlight)
+           (evil-snipe-enable-incremental-highlight))))
 
 (use-package evil-numbers
   :commands (evil-numbers/inc-at-pt evil-numbers/dec-at-pt))