diff --git a/emacs/init.el b/emacs/init.el
index 3ab03cd..f5c507f 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -126,6 +126,7 @@
     "fb" '(counsel-switch-buffer :which-key "find buffers")
     "gf" '(counsel-ag :which-key "grep")
     "gF" '(counsel-git-grep :which-key "git grep")
+    "gg" '(magit-status :whichkey "magit")
     "t"  '(:ignore t :which-key "toggles")
     "tt" '(counsel-load-theme :which-key "choose theme")
     "p"  '(projectile-command-map :which-key "projectile")
@@ -175,3 +176,7 @@
 
 (use-package counsel-projectile
   :config (counsel-projectile-mode))
+
+(use-package magit
+  :custom
+  (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))