diff --git a/contrib/gtags/packages.el b/contrib/gtags/packages.el
index 2111c836c..407316f26 100644
--- a/contrib/gtags/packages.el
+++ b/contrib/gtags/packages.el
@@ -48,7 +48,6 @@ which require an initialization must be listed explicitly in the list.")
     :defer t
     :init
     (progn
-      (add-hook 'prog-mode-hook 'helm-gtags-mode)
       (setq helm-gtags-ignore-case t
             helm-gtags-auto-update t
             helm-gtags-use-input-at-cursor t
diff --git a/contrib/lang/c-c++/packages.el b/contrib/lang/c-c++/packages.el
index 2e3c2ca2f..c72c150e5 100644
--- a/contrib/lang/c-c++/packages.el
+++ b/contrib/lang/c-c++/packages.el
@@ -57,6 +57,7 @@ which require an initialization must be listed explicitly in the list.")
   (add-to-hooks 'flycheck-mode '(c-mode-hook c++-mode-hook)))
 
 (defun c-c++/post-init-helm-gtags ()
+  (add-hook 'c-mode-common-hook 'helm-gtags-mode)
   (spacemacs/gtags-define-keys-for-mode 'c-mode)
   (spacemacs/gtags-define-keys-for-mode 'c++-mode))