diff --git a/lisp/init-custom.el b/lisp/init-custom.el
index 7f9eb0d..02daf15 100644
--- a/lisp/init-custom.el
+++ b/lisp/init-custom.el
@@ -63,4 +63,9 @@
 (when (file-exists-p custom-file)
     (load-file custom-file))
 
+(use-package emacs
+  :custom
+  (help-window-select t "Switch to help buffers automatically")
+  )
+
 (provide 'init-custom)
diff --git a/lisp/init-helm.el b/lisp/init-helm.el
index 5f5c74d..bb67220 100644
--- a/lisp/init-helm.el
+++ b/lisp/init-helm.el
@@ -83,7 +83,7 @@
         ;; command used for `fzf-grep-*` functions
         ;; example usage for ripgrep:
         ;; fzf/grep-command "rg --no-heading -nH"
-        fzf/grep-command "grep -nrH"
+        fzf/grep-command "grep -inrH"
         ;; If nil, the fzf buffer will appear at the top of the window
         fzf/position-bottom t
         fzf/window-height 15))
diff --git a/lisp/init-lsp.el b/lisp/init-lsp.el
index e92e796..f293d73 100644
--- a/lisp/init-lsp.el
+++ b/lisp/init-lsp.el
@@ -24,6 +24,8 @@
   :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
          (go-mode . lsp-defered)
          (python-mode . lsp-deferred)
+         (c-mode . lsp-deferred)
+         (c++-mode . lsp-deferred)
          ;; if you want which-key integration
          (lsp-mode . lsp-enable-which-key-integration))
   :bind (:map lsp-mode-map