1 files changed, 5 insertions, 0 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 90a9f96bb..7d47e9bb5 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3895,6 +3895,11 @@ sub choices {
     my @resolutions = grep($_->name, @{ $resolution_field->legal_values });
     $choices{'resolution'} = \@resolutions;
 
+    foreach my $key (keys %choices) {
+        my $name = $self->$key;
+        $choices{$key} = [grep { $_->is_active || $_->name eq $name } @{ $choices{$key} }];
+    }
+
     $self->{'choices'} = \%choices;
     return $self->{'choices'};
 }