diff --git a/config/fish/config.fish b/config/fish/config.fish
index eabc017..8192297 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -4,11 +4,9 @@
 # Disable fish greeting
 set -g fish_greeting
 
-alias nvim='/usr/local/nvim_012/bin/nvim'
-
 # Core settings
-set -gx EDITOR nvim
-set -gx VISUAL nvim
+set -gx EDITOR "/usr/local/nvim_012/bin/nvim"
+set -gx VISUAL "/usr/local/nvim_012/bin/nvim"
 set -gx MANPAGER "nvim +Man!"
 set -gx BROWSER firefox
 set -gx TERM xterm-256color
@@ -81,6 +79,7 @@ alias top='btop'
 alias cat='batcat --theme="gruvbox-dark" --paging=never '
 
 # Application shortcuts
+alias nvim='/usr/local/nvim_012/bin/nvim'
 alias vim='nvim'
 alias v='nvim'
 alias :q='exit'