diff --git a/.config/vim/vimrc.d/30-settings.vim b/.config/vim/vimrc.d/30-settings.vim
index e78e545..bc58e56 100644
--- a/.config/vim/vimrc.d/30-settings.vim
+++ b/.config/vim/vimrc.d/30-settings.vim
@@ -1,6 +1,11 @@
 " Settings """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " hybrid linenumbers
 set number relativenumber
+augroup numbertoggle
+	au!
+	au BufEnter,FocusGained,InsertLeave,WinEnter * if &nu | set rnu   | endif
+	au BufLeave,FocusLost,InsertEnter,WinLeave   * if &nu | set nornu | endif
+augroup END
 " no timeout when exiting insert-mode
 " (see https://www.johnhawthorn.com/2012/09/vi-escape-delays/)
 set timeoutlen=1000 ttimeoutlen=0
diff --git a/.config/vim/vimrc.d/80-autocommands.vim b/.config/vim/vimrc.d/80-autocommands.vim
index 5d01f94..d167466 100644
--- a/.config/vim/vimrc.d/80-autocommands.vim
+++ b/.config/vim/vimrc.d/80-autocommands.vim
@@ -57,9 +57,3 @@ augroup highlight_current_word
 	au CursorHold * :exec 'match CursorColumn /\V\<' . escape(expand('<cword>'), '/\') . '\>/'
 	au CursorMoved * :exec 'match'
 augroup END
-
-augroup numbertoggle
-	au!
-	au BufEnter,FocusGained,InsertLeave,WinEnter * if &nu | set rnu   | endif
-	au BufLeave,FocusLost,InsertEnter,WinLeave   * if &nu | set nornu | endif
-augroup END