diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index 63d8cd0dd9a..b9fc8a52c47 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -902,6 +902,10 @@ if ($dotweak) {
     }
 }
 
+# If we're editing a stored query, use the existing query name as default for
+# the "Remember search as" field.
+$vars->{'defaultsavename'} = $cgi->param('query_based_on');
+
 
 ################################################################################
 # HTTP Header Generation
diff --git a/mozilla/webtools/bugzilla/query.cgi b/mozilla/webtools/bugzilla/query.cgi
index 9d483883677..17e62f5ec0f 100755
--- a/mozilla/webtools/bugzilla/query.cgi
+++ b/mozilla/webtools/bugzilla/query.cgi
@@ -395,6 +395,9 @@ if (($::FORM{'query_format'} || $::FORM{'format'} || "") eq "create-series") {
     $vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
 }
 
+$vars->{'known_name'} = $cgi->param('known_name');
+
+
 # Add in the defaults.
 $vars->{'default'} = \%default;
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
index c0291024cc0..80348906f60 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
@@ -22,6 +22,7 @@
 [%# INTERFACE:
   # searchtype: string. Type of search - either "series", "saved" or undef.
   # ...
+  # defaultsavename: string. The default name for saving the query.
   #%]
 
 [%############################################################################%]
@@ -159,7 +160,11 @@
     [% END %]
     
     <td valign="middle">
-      <a href="query.cgi?[% urlquerypart FILTER html %]">Edit&nbsp;Search</a>
+      [% editqueryname = searchname OR defaultsavename OR '' %]
+      <a href="query.cgi?[% urlquerypart FILTER html %]
+      [% IF editqueryname != '' %]&amp;known_name=
+        [% editqueryname FILTER url_quote %]
+      [% END %]">Edit&nbsp;Search</a>
     </td>
       
     [% IF searchtype == "saved" %]
@@ -179,7 +184,8 @@
                  value="[% urlquerypart FILTER html %]">
           <input type="hidden" name="cmdtype" value="doit">
           <input type="hidden" name="remtype" value="asnamed">
-          <input type="text" name="newqueryname" size="20"> 
+          <input type="text" name="newqueryname" size="20"
+                 value="[% defaultsavename FILTER html %]"> 
         </form> 
       </td>
     [% END %]  
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/knob.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/knob.html.tmpl
index c92ad92cc12..68d279047ff 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/knob.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/knob.html.tmpl
@@ -21,6 +21,15 @@
   #                 Jouni Heikniemi <jouni@heikniemi.net>
   #%]
 
+[%# INTERFACE:
+  # (incomplete!)
+  # ...
+  # known_name: string. Possibly known stored name for the query being 
+  #                     edited. This value is just passed through in a
+  #                     hidden field.
+  #%]
+        
+        
 [% PROCESS global/variables.none.tmpl %]
 
 [%# This is not necessary for English templates, but useful for localisers. %]
@@ -46,6 +55,10 @@
 
 <p>  
   <input type="submit" value="[% button_name FILTER html %]">
+  [% IF known_name %]
+    <input type="hidden" name="query_based_on" 
+           value="[% known_name FILTER html %]">
+  [% END %]
 </p>
 
 <p>