diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index ec04a652c46..37b9bb925d5 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-6721
\ No newline at end of file
+6722
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/js/field.js b/mozilla/webtools/bugzilla/js/field.js
index 700c1de8dc8..1300e1c533e 100644
--- a/mozilla/webtools/bugzilla/js/field.js
+++ b/mozilla/webtools/bugzilla/js/field.js
@@ -267,6 +267,15 @@ function showHideStatusItems(e, dupArrayInfo) {
     // finish doing stuff based on the selection.
     if ( el ) {
         showDuplicateItem(el);
+
+        // Make sure that fields whose visibility or values are controlled
+        // by "resolution" behave properly when resolution is hidden.
+        var resolution = document.getElementById('resolution');
+        if (resolution && resolution.options[0].value != '') {
+            var emptyOption = new Option('', '');
+            resolution.insertBefore(emptyOption, resolution.options[0]);
+            emptyOption.selected = true;
+        }
         YAHOO.util.Dom.addClass('resolution_settings', 'bz_default_hidden');
         if (document.getElementById('resolution_settings_warning')) {
             YAHOO.util.Dom.addClass('resolution_settings_warning',
@@ -274,18 +283,24 @@ function showHideStatusItems(e, dupArrayInfo) {
         }
         YAHOO.util.Dom.addClass('duplicate_display', 'bz_default_hidden');
 
-        if ( el.value == dupArrayInfo[1] && dupArrayInfo[0] == "is_duplicate" ) {
+
+        if ( (el.value == dupArrayInfo[1] && dupArrayInfo[0] == "is_duplicate")
+             || bz_isValueInArray(close_status_array, el.value) ) 
+        {
             YAHOO.util.Dom.removeClass('resolution_settings', 
                                        'bz_default_hidden');
             YAHOO.util.Dom.removeClass('resolution_settings_warning', 
-                                       'bz_default_hidden');  
+                                       'bz_default_hidden');
+
+            // Remove the blank option we inserted.
+            if (resolution && resolution.options[0].value == '') {
+                resolution.removeChild(resolution.options[0]);
+                resolution.options[0].selected = true;
+            }
         }
-        else if ( bz_isValueInArray(close_status_array, el.value) ) {
-            // hide duplicate and show resolution
-            YAHOO.util.Dom.removeClass('resolution_settings', 
-                                       'bz_default_hidden');
-            YAHOO.util.Dom.removeClass('resolution_settings_warning', 
-                                       'bz_default_hidden');
+
+        if (resolution) {
+            bz_fireEvent(resolution, 'change');
         }
     }
 }