diff --git a/configs/nvim/init.vim b/configs/nvim/init.vim
index 60e7b49..8347f88 100644
--- a/configs/nvim/init.vim
+++ b/configs/nvim/init.vim
@@ -30,6 +30,11 @@ endif
 " Enable Leap
 lua require('leap').add_default_mappings()
 
+" VSCode-style comment toggling
+nnoremap <C-_> :Commentary<CR>
+vnoremap <C-_> :Commentary<CR>
+inoremap <C-_> <C-O>:Commentary<CR>
+
 " Custom functions
 function! MkdirAndWrite()
     let dir = expand('%:p:h')
diff --git a/configs/vim/.vimrc b/configs/vim/.vimrc
index 275dd4a..73ea498 100644
--- a/configs/vim/.vimrc
+++ b/configs/vim/.vimrc
@@ -27,11 +27,6 @@ inoremap <C-BS> <C-W>
 inoremap <C-Del> <Esc>lcw
 nnoremap <C-Del> cw<Esc>l
 
-" VSCode-style comment toggling
-nnoremap <C-_> :Commentary<CR>
-vnoremap <C-_> :Commentary<CR>
-inoremap <C-_> <C-O>:Commentary<CR>
-
 " Force VIM to use system clipboard
 set clipboard=unnamedplus