diff --git a/Source/Core/Controls/Scripting/ScriptDocumentTab.cs b/Source/Core/Controls/Scripting/ScriptDocumentTab.cs
index 33bd105c6226b3caef53efedd16a45061a627a41..203078113189b11d0870fa7a8a71643237e72509 100755
--- a/Source/Core/Controls/Scripting/ScriptDocumentTab.cs
+++ b/Source/Core/Controls/Scripting/ScriptDocumentTab.cs
@@ -208,6 +208,7 @@ namespace CodeImp.DoomBuilder.Controls
         protected void RemoveTrailingWhitespace()
         {
             // after changing the contents, selection should stay on the same line, and just move to the end of that line if it was on the trailing space.
+            int vscroll = editor.Scintilla.FirstVisibleLine;
             int selectionStart = editor.SelectionStart;
             int selectionEnd = editor.SelectionEnd;
 
@@ -240,6 +241,7 @@ namespace CodeImp.DoomBuilder.Controls
             editor.Text = string.Join("\n", atext);
             editor.SelectionStart = selectionStart;
             editor.SelectionEnd = selectionEnd;
+            editor.Scintilla.FirstVisibleLine = vscroll;
         }
 
 		// This saves the document (used for both explicit and implicit)
diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs
index 886c3179f4ed98c9957bb10c0afb0a4d5b0e8ca3..7bc5f34485041a969394037761d123c67b2ed27c 100755
--- a/Source/Core/Properties/AssemblyInfo.cs
+++ b/Source/Core/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.2918")]
+[assembly: AssemblyVersion("2.3.0.2920")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
-[assembly: AssemblyHash("2bb2c92")]
+[assembly: AssemblyHash("39889a9")]
diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
index fdebd0abdfcf091493299f74ca2040dec37839c5..81bc70f25c684608f6f05a3e08c180e96ae50424 100755
--- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
+++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Resources;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.2918")]
+[assembly: AssemblyVersion("2.3.0.2920")]
 [assembly: NeutralResourcesLanguageAttribute("en")]