diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 4ab1e1c..d6666fd 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -838,6 +838,8 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 
 (evil-set-initial-state 'magit-status-mode 'normal)
 (evil-set-initial-state 'magit-log-mode 'normal)
+(evil-set-initial-state 'magit-diff-mode 'normal)
+(evil-set-initial-state 'magit-refs-mode 'normal)
 (evil-define-key 'normal magit-status-mode-map
   "j" 'evil-next-visual-line
   "k" 'evil-previous-visual-line
@@ -846,7 +848,24 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
   "u" 'magit-unstage
   "l" 'magit-log
   "F" 'magit-pull
-  "p" 'magit-push)
+  "p" 'magit-push
+  "q" '+magit/quit
+  (kbd "<return>") 'magit-visit-ref)
+(evil-define-key 'normal magit-log-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "q" '+magit/quit
+  (kbd "<return>") 'magit-visit-ref)
+(evil-define-key 'normal magit-diff-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "q" '+magit/quit
+  (kbd "<return>") 'magit-visit-ref)
+(evil-define-key 'normal magit-refs-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "q" '+magit/quit
+  (kbd "<return>") 'magit-visit-ref)
 
 ;;;------ dired configuration ------;;;
 
@@ -945,6 +964,14 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 
 ;(add-hook 'org-mode-hook #'focus-mode)
 
+;;;------ helpful configuration ------;;;
+
+(evil-set-initial-state 'helpful-mode 'normal)
+(evil-define-key 'normal helpful-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "q" 'helpful-kill-buffers)
+
 ;;;-- Load emacs application framework;;;--
 (use-package! eaf
   :load-path "~/.emacs.d/eaf/"
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index a81b11f..ceea5cb 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -17,6 +17,7 @@
   - [[#hledger-mode-configuration][hledger-mode Configuration]]
   - [[#tab-bar-configuration][Tab Bar Configuration]]
   - [[#focus-mode-configuration][Focus Mode Configuration]]
+  - [[#helpful-mode-configuration][Helpful Mode Configuration]]
   - [[#eaf][EAF]]
 - [[#my-initel][My init.el]]
 - [[#my-packagesel][My packages.el]]
@@ -1188,6 +1189,8 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 
 (evil-set-initial-state 'magit-status-mode 'normal)
 (evil-set-initial-state 'magit-log-mode 'normal)
+(evil-set-initial-state 'magit-diff-mode 'normal)
+(evil-set-initial-state 'magit-refs-mode 'normal)
 (evil-define-key 'normal magit-status-mode-map
   "j" 'evil-next-visual-line
   "k" 'evil-previous-visual-line
@@ -1196,7 +1199,24 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
   "u" 'magit-unstage
   "l" 'magit-log
   "F" 'magit-pull
-  "p" 'magit-push)
+  "p" 'magit-push
+  "q" '+magit/quit
+  (kbd "<return>") 'magit-visit-ref)
+(evil-define-key 'normal magit-log-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "q" '+magit/quit
+  (kbd "<return>") 'magit-visit-ref)
+(evil-define-key 'normal magit-diff-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "q" '+magit/quit
+  (kbd "<return>") 'magit-visit-ref)
+(evil-define-key 'normal magit-refs-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "q" '+magit/quit
+  (kbd "<return>") 'magit-visit-ref)
 
 #+END_SRC
 ** Dired Configuration
@@ -1311,6 +1331,17 @@ I don't have this active right now since I'm exploring tab-bar mode instead!
 
 ;(add-hook 'org-mode-hook #'focus-mode)
 
+#+END_SRC
+** Helpful Mode Configuration
+#+BEGIN_SRC emacs-lisp :tangle config.el
+;;;------ helpful configuration ------;;;
+
+(evil-set-initial-state 'helpful-mode 'normal)
+(evil-define-key 'normal helpful-mode-map
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "q" 'helpful-kill-buffers)
+
 #+END_SRC
 ** EAF
 #+BEGIN_SRC emacs-lisp :tangle config.el