diff --git a/webtools/bugzilla/editflagtypes.cgi b/webtools/bugzilla/editflagtypes.cgi
index c8eb159c225..dfef556474b 100755
--- a/webtools/bugzilla/editflagtypes.cgi
+++ b/webtools/bugzilla/editflagtypes.cgi
@@ -189,10 +189,12 @@ sub processCategoryChange {
         push(@exclusions, $category) unless grep($_ eq $category, @exclusions);
     }
     elsif ($categoryAction eq 'removeInclusion') {
-        @inclusions = map(($_ eq $cgi->param('inclusion_to_remove') ? () : $_), @inclusions);
+        my @inclusion_to_remove = $cgi->param('inclusion_to_remove');
+        @inclusions = map {(lsearch(\@inclusion_to_remove, $_) < 0) ? $_ : ()} @inclusions;
     }
     elsif ($categoryAction eq 'removeExclusion') {
-        @exclusions = map(($_ eq $cgi->param('exclusion_to_remove') ? () : $_), @exclusions);
+        my @exclusion_to_remove = $cgi->param('exclusion_to_remove');
+        @exclusions = map {(lsearch(\@exclusion_to_remove, $_) < 0) ? $_ : ()} @exclusions;
     }
     
     # Convert the array @clusions('prod_ID:comp_ID') back to a hash of