diff --git a/.gitconfig.erb b/.gitconfig.erb
index 197464e..90e43de 100644
--- a/.gitconfig.erb
+++ b/.gitconfig.erb
@@ -7,7 +7,7 @@
 [color]
   ui = true
 [core]
-  editor = /usr/local/bin/vim
+  editor = subl -n -w
   autocrlf = input
   safecrlf = true
 [merge]
diff --git a/.pryrc b/.pryrc
index f37292b..8c05ddd 100644
--- a/.pryrc
+++ b/.pryrc
@@ -1,4 +1,4 @@
-Pry.config.editor = 'subl -w'
+Pry.config.editor = 'subl -n -w'
 
 # https://github.com/kyrylo/pry-theme
 # $ gem install pry-theme
diff --git a/.zshrc b/.zshrc
index 5d3e031..1433051 100644
--- a/.zshrc
+++ b/.zshrc
@@ -11,7 +11,7 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
 fi
 
 # Customize to your needs...
-export EDITOR="subl -w"
+export EDITOR="subl -n -w"
 export HOMEBREW_CASK_OPTS="--appdir=/Applications"
 export PATH=/usr/local/share/npm/bin:$PATH
 eval "$(rbenv init -)"