diff --git a/nvim/plugin/editing.vim b/nvim/plugin/editing.vim
index 8b2ec27..62b7c4c 100644
--- a/nvim/plugin/editing.vim
+++ b/nvim/plugin/editing.vim
@@ -31,6 +31,13 @@ set commentstring=//%s
   let g:indentLine_showFirstIndentLevel = 1
   let g:indentLine_fileTypeExclude = ['text', 'help', 'tutor', 'man']
 
+  augroup vimrc-indentlines-disable
+    autocmd!
+    autocmd TermOpen * IndentLinesDisable
+    " <https://github.com/Yggdroot/indentLine/issues/315#issuecomment-734535963>
+    autocmd VimEnter * if bufname('%') == '' | IndentLinesDisable | endif
+  augroup END
+
   let g:detectindent_max_lines_to_analyse = 128
   let g:detectindent_check_comment_syntax = 1
 
diff --git a/nvim/plugin/interface.vim b/nvim/plugin/interface.vim
index 48619e1..11671da 100644
--- a/nvim/plugin/interface.vim
+++ b/nvim/plugin/interface.vim
@@ -137,12 +137,4 @@ endif
 " }}}
 
 
-" Terminal {{{
-  augroup vimrc-terminal
-    autocmd!
-    autocmd TermOpen * IndentLinesDisable
-  augroup END
-" }}}
-
-
 nnoremap <silent> <F9> <Cmd>make<CR>