diff --git a/.zshrc b/.zshrc
index 3c61826..119a0b9 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,6 +1,14 @@
 # Set Nimble's installation directory so it can be used in $PATH
 export NIMBLE_DIR=$HOME/.nimble
 
+# Preferred editor for local and remote sessions
+if [[ -n $SSH_CONNECTION ]]; then
+  export EDITOR='/usr/bin/nvim'
+else
+  export EDITOR='/usr/bin/nvim'
+  export BROWSER='zen-browser'
+fi
+
 # If you come from bash you might have to change your $PATH.
 export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$HOME/.cargo/bin:/usr/local/go/bin:$HOME/go/bin:$NIMBLE_DIR/bin:$PATH
 
@@ -96,13 +104,7 @@ source $ZSH/oh-my-zsh.sh
 # You may need to manually set your language environment
 export LANG=en_US.UTF-8
 
-# Preferred editor for local and remote sessions
-if [[ -n $SSH_CONNECTION ]]; then
-  export EDITOR='/usr/bin/nvim'
-else
-  export EDITOR='/usr/bin/nvim'
-  export BROWSER='zen-browser'
-fi
+
 
 # n³ settings
 export NNN_ARCHIVE="\\.(7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|rar|rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)$"