diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc
index b40a79e..b03ce4d 100644
--- a/assets/default/dotfiles/bashrc
+++ b/assets/default/dotfiles/bashrc
@@ -80,6 +80,10 @@ fi
 # Increase memory sizes for java using Ant
 export ANT_OPTS="-Xmx2048m -Xms512m"
 
+# Set vim to default editor
+export EDITOR=vim
+export VISUAL="$EDITOR"
+
 # Set file as having been loaded to avoid looping
 IS_BASHRC_LOADED=true
 # If an interactive shell and .bash_profile hasn't been loaded, load it
diff --git a/assets/default/dotfiles/zshrc b/assets/default/dotfiles/zshrc
index 58794c2..39ed2df 100644
--- a/assets/default/dotfiles/zshrc
+++ b/assets/default/dotfiles/zshrc
@@ -147,4 +147,8 @@ if [ -n "$FZF_DEFAULT_COMMAND" ]; then
     export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND \$dir"
 fi
 
+# Set vim to default editor
+export EDITOR=vim
+export VISUAL="$EDITOR"
+
 # vim: set filetype=zsh:
diff --git a/assets/default/fish/init/env.fish b/assets/default/fish/init/env.fish
index bc61a23..01b3f67 100644
--- a/assets/default/fish/init/env.fish
+++ b/assets/default/fish/init/env.fish
@@ -6,6 +6,10 @@ set -gx XDG_CACHE_HOME "$HOME/.cache"
 # Increase memory sizes for java using Ant
 set -gx ANT_OPTS "-Xmx2048m -Xms512m"
 
+# Set default editor to vim
+set -gx EDITOR vim
+set -gx VISUAL "$EDITOR"
+
 # Interractive env variables
 if status --is-interactive
     # FZF