diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index 4b9bc960f16..fd01f10d5fa 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -239,6 +239,7 @@ sub InsertNamedQuery ($$$;$) {
     # Validate the query name.
     $query_name || ThrowUserError("query_name_missing");
     $query_name !~ /[<>&]/ || ThrowUserError("illegal_query_name");
+    (length($query_name) <= 64) || ThrowUserError("query_name_too_long");
     trick_taint($query_name);
 
     detaint_natural($userid);
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
index ac2cba6d3c9..55c7969242e 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
@@ -862,6 +862,10 @@
     [% title = "No Search Name Specified" %]
     You must enter a name for your search.
 
+  [% ELSIF error == "query_name_too_long" %]
+    [% title = "Query Name Too Long" %]
+    The name of the query must be less than 64 characters long.
+
   [% ELSIF error == "quips_disabled" %]
     [% title = "Quips Disabled" %]
     Quips are disabled.