diff --git a/.ashrc b/.ashrc
index 7454979..5f4d6d5 100644
--- a/.ashrc
+++ b/.ashrc
@@ -12,7 +12,9 @@ is_ssh() {
 }
 
 # The shell might not start in the home directory.
-cd "$HOME"
+if [ "$(pwd)" = "/" ]; then
+    cd "$HOME"
+fi
 
 # Signal to some programs that vi is the editor that should be launched.
 export EDITOR=nvim
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 2587091..96304ba 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -16,10 +16,11 @@ set fileformat=unix
 set encoding=UTF-8
 
 set syntax=on
-set colorcolumn=72,80,100
+set colorcolumn=80,100
+set textwidth=80
 
 set autoread
-set spell
+" set spell
 
 set ignorecase
 set smartcase
@@ -31,3 +32,5 @@ set showmode
 
 set mouse= " Disable mouse support
 
+" Prevent the terminal from swallowing ESC
+tnoremap <Esc> <C-\><C-n>