diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 0ffda7e..154d6a5 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.5.610")]
-[assembly: AssemblyFileVersion("3.0.5.610")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.0.5.611")]
+[assembly: AssemblyFileVersion("3.0.5.611")]
\ No newline at end of file
diff --git a/WebApplication/Edit.aspx.cs b/WebApplication/Edit.aspx.cs
index 6693897..baf7ed7 100644
--- a/WebApplication/Edit.aspx.cs
+++ b/WebApplication/Edit.aspx.cs
@@ -93,8 +93,14 @@ namespace ScrewTurn.Wiki {
 			}
 
 			// Load requested page, if any
-			if(Request["Page"] != null) {
-				string name = Request["Page"];
+			if(Request["Page"] != null || Page.IsPostBack) {
+				string name = null;
+				if(Request["Page"] != null) {
+					name = Request["Page"];
+				}
+				else {
+					name = txtName.Text;
+				}
 
 				currentPage = Pages.FindPage(name);