diff --git a/runtime/indent/vb.vim b/runtime/indent/vb.vim
index b570b56..85021bd 100644
--- a/runtime/indent/vb.vim
+++ b/runtime/indent/vb.vim
@@ -8,10 +8,13 @@
 endif
 let b:did_indent = 1
 
+setlocal autoindent
 setlocal indentexpr=VbGetIndent(v:lnum)
 setlocal indentkeys&
 setlocal indentkeys+==~else,=~elseif,=~end,=~wend,=~case,=~next,=~select,=~loop,<:>
 
+let b:undo_indent = "set ai< indentexpr< indentkeys<"
+
 " Only define the function once.
 if exists("*VbGetIndent")
     finish