diff --git a/plugin/DoxygenToolkit.vim b/plugin/DoxygenToolkit.vim
index 37d51a6..33621c5 100644
--- a/plugin/DoxygenToolkit.vim
+++ b/plugin/DoxygenToolkit.vim
@@ -552,6 +552,9 @@ endfunction
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 function! <SID>DoxygenCommentFunc()
 
+  " Prevent autoindent from placing too much indentation when placing spaces in manual configuration
+  set noautoindent
+
   " Initialize default templates.
   " Assure compatibility with Python for classes (cf. endDocPattern).
   let l:emptyLinePattern = '^[[:blank:]]*$'
@@ -839,6 +842,8 @@ function! <SID>DoxygenCommentFunc()
   "  endfor
   "endif
 
+  set autoindent
+
 endfunction