diff --git a/emacs/init.el b/emacs/init.el
index b3996b2..e29c6a1 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -201,7 +201,13 @@
 
 ;; Origamimode
 (use-package origami
-  :config (global-origami-mode t))
+  :ensure evil
+  :config (global-origami-mode t)
+  (evil-define-key 'normal 'global (kbd "<leader> f o") 'origami-open-node)
+  (evil-define-key 'normal 'global (kbd "<leader> f c") 'origami-close-node)
+  (evil-define-key 'normal 'global (kbd "<leader> f O") 'origami-open-all-nodes)
+  (evil-define-key 'normal 'global (kbd "<leader> f C") 'origami-close-all-nodes)
+  (evil-define-key 'normal 'global (kbd "<leader> f t") 'origami-show-only-node))
 
 ;; Page-break-lines
 (use-package page-break-lines
diff --git a/zsh/zshrc b/zsh/zshrc
index cfd8c80..0b5ea99 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -36,8 +36,8 @@ zle -N down-line-or-beginning-search
 
 
 export COMPLETION_WAITING_DOTS="true"
-export VISUAL='emacsclient -cn'
-export EDITOR='emacsclient -cn'
+export VISUAL='emacsclient -c'
+export EDITOR='emacsclient -c'
 path=("$HOME/bin" "$HOME/go/bin" $path)
 
 zstyle ':znap:*' auto-compile no