Index: templates/query.cs
===================================================================
--- templates/query.cs	(revision 1014)
+++ templates/query.cs	(working copy)
@@ -48,8 +48,19 @@
    <script type="text/javascript">
      var status = document.getElementById("status");
      var updateResolution = function() {
-       enableControl('resolution', status.selectedIndex == -1 ||
-                                   status.options[3].selected);
+       var bEnable = true
+       if (status.selectedIndex != -1) {
+         for (i=0; i < status.options.length; ++i) {
+           if (status.options[i].selected &&
+               (status.options[i].text == 'new'   ||
+                status.options[i].text == 'assigned' ||
+                status.options[i].text == 'reopened')) {
+             bEnable = false
+             break
+           }
+         }
+       }
+       enableControl('resolution', bEnable);
      };
      addEvent(window, 'load', updateResolution);
      addEvent(status, 'change', updateResolution);