diff --git a/emacs/.emacs.d/config/init-completion.el b/emacs/.emacs.d/config/init-completion.el
index 5257674..77d1eb7 100644
--- a/emacs/.emacs.d/config/init-completion.el
+++ b/emacs/.emacs.d/config/init-completion.el
@@ -62,6 +62,9 @@
 ;; Embark adds context actions to completion candidates (and other things!)
 (use-package embark
   :config
+  ;; Make sure identifier at point is the first target
+  (setq embark-target-finders (remove 'embark-target-identifier-at-point embark-target-finders))
+  (add-to-list 'embark-target-finders 'embark-target-identifier-at-point)
   (defun embark-which-key-indicator ()
     "An embark indicator that displays keymaps using which-key.
 The which-key help message will show the type and value of the