diff --git a/neostrophic.vim b/neostrophic.vim
index b6ab549..d8b7fbd 100644
--- a/neostrophic.vim
+++ b/neostrophic.vim
@@ -190,9 +190,19 @@ Plug 'zchee/deoplete-jedi'
 call plug#end()
 
 
-" Goyo and Limelight
-autocmd! User GoyoEnter Limelight
-autocmd! User GoyoLeave Limelight!
+" Goyo
+function! s:on_goyo_enter()
+  setlocal nocursorline
+  Limelight
+endfunction
+
+function! s:on_goyo_leave()
+  setlocal cursorline
+  Limelight!
+endfunction
+
+autocmd! User GoyoEnter nested call <SID>on_goyo_enter()
+autocmd! User GoyoLeave nested call <SID>on_goyo_leave()
 
 
 " Keybinds