diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/DocumentScript.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/DocumentScript.cs
index 7e4e9e0b36..623182933a 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/DocumentScript.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/DocumentScript.cs
@@ -52,9 +52,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		
 		public override void Dispose()
 		{
+			// Since base.Dispose() reformats some nodes; we need to include it in the undo group
+			base.Dispose();
 			if (undoGroup != null)
 				undoGroup.Dispose();
-			base.Dispose();
 		}
 		
 		public override void Remove(AstNode node, bool removeEmptyLine)