Index: FlexWiki.Web/WikiEdit.aspx.cs
===================================================================
--- FlexWiki.Web/WikiEdit.aspx.cs	(revision 641)
+++ FlexWiki.Web/WikiEdit.aspx.cs	(working copy)
@@ -49,12 +49,12 @@
                 string answer = null;
                 if (IsPost)
                 {
-                    answer = Request.Form["ReturnTopic"];
-                }
+                    answer = Request.Form["Topic"];
+				}
                 else
                 {
-                    answer = Request.QueryString["return"];
-                }
+                    answer = Request.QueryString["topic"];
+				}
                 if (answer == "")
                 {
                     answer = null;
@@ -232,19 +232,25 @@
                 string topic = "<<null>>";
                 if (TheTopic != null && TheTopic.DottedName != null)
                 {
-                    topic = TheTopic.DottedName;
-                    // On a null edit we want to make sure we go back to the right place. Without setting
-                    // returnTo, we'll wind up at the wiki default page. 
-                    returnTo = TheTopic; 
+                    topic = TheTopic.DottedName; 
                 }
                 FlexWikiWebApplication.LogDebug(this.GetType().ToString(), "A null edit was submitted for topic " + topic); 
             }
 
             if (returnTo == null)
             {
-                FlexWikiWebApplication.LogDebug(this.GetType().ToString(),
-                    "Redirecting to wiki root."); 
-                Response.Redirect(RootUrl);
+               
+                if (TheTopic != null && TheTopic.DottedName != null)
+                {
+                    Response.Redirect(TheLinkMaker.LinkToTopic(ReturnTopic.ToString()));
+                }
+                else
+                {
+                    FlexWikiWebApplication.LogDebug(this.GetType().ToString(),
+                        "Redirecting to wiki root.");
+                    Response.Redirect(RootUrl);
+                }
+                
             }
             else
             {