diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 099f2b1..2ebb92a 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1024,7 +1024,8 @@ from myaethon2.core.decorators import (
                              jabber-chat-mode diff-mode prodigy-mode
                              calculator-mode messages-buffer-mode
                              help-mode prodigy-view-mode eww-mode))
-  (evil-set-initial-state 'git-commit-mode 'normal)
+  (evil-set-initial-state 'git-commit-mode 'insert)
+  (add-hook 'org-capture-mode-hook #'evil-insert-state)
   (require 'evil-nerd-commenter)
   (define-key evil-normal-state-map ",s" 'oni:evil-sort-lines-operator)
   (add-hook 'before-save-hook #'oni:maybe-switch-to-normal-state))