diff --git a/.emacs.d/lisp/init-helm.el b/.emacs.d/lisp/init-helm.el
index cf41ed2d..c7e01f0a 100644
--- a/.emacs.d/lisp/init-helm.el
+++ b/.emacs.d/lisp/init-helm.el
@@ -214,9 +214,9 @@ Requires `call-process-to-string' from `functions'."
  "C-x M-G" 'helm-do-grep-ag)
 
 ;;; Use the M-s prefix just like `occur'.
-(define-key prog-mode-map (kbd "M-s f") 'helm-semantic-or-imenu)
+(define-key prog-mode-map (kbd "M-s f") 'helm-imenu-in-all-buffers)
 ;;; The text-mode-map binding targets structured text modes like Markdown.
-(define-key text-mode-map (kbd "M-s f") 'helm-semantic-or-imenu)
+(define-key text-mode-map (kbd "M-s f") 'helm-imenu-in-all-buffers)
 (with-eval-after-load 'org
   (require 'helm-org-contacts nil t)
   (define-key org-mode-map (kbd "M-s f") 'helm-org-in-buffer-headings))
diff --git a/.emacs.d/lisp/init-tex.el b/.emacs.d/lisp/init-tex.el
index 3ed0a74e..5b49fd30 100644
--- a/.emacs.d/lisp/init-tex.el
+++ b/.emacs.d/lisp/init-tex.el
@@ -29,7 +29,7 @@ This does not interfere with `subword-mode'."
   (setq-default TeX-master nil)
 
   (when (require 'helm-config nil t)
-    (define-key TeX-mode-map (kbd "M-s f") 'helm-semantic-or-imenu))
+    (define-key TeX-mode-map (kbd "M-s f") 'helm-imenu-in-all-buffers))
 
   ;; Update PDF buffers after successful LaTeX runs
   (add-hook 'TeX-after-compilation-finished-functions