diff --git a/nvim/.config/nvim/plugin/settings.vim b/nvim/.config/nvim/plugin/settings.vim
index fba63d12..640a3940 100644
--- a/nvim/.config/nvim/plugin/settings.vim
+++ b/nvim/.config/nvim/plugin/settings.vim
@@ -38,3 +38,8 @@ set linebreak
 " Sets tool for opening non-text files with gx
 " If in netrw, this is run with just x
 let g:netrw_browsex_viewer = "opout"
+
+" Automatically insert comment leader after hitting enter
+set formatoptions+=r
+" Automatically insert comment leader after hitting o or O
+set formatoptions+=o