diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 7fdd29d09..d6d3db7f5 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -21,10 +21,14 @@ function toggle_filter(field) {
     
     if (check_box.checked) {
         Element.show("operators_" + field);
+				Form.Element.enable("operators_" + field);
+        Form.Element.enable("values_" + field);
         toggle_operator(field);
     } else {
         Element.hide("operators_" + field);
         Element.hide("div_values_" + field);
+        Form.Element.disable("operators_" + field);
+        Form.Element.disable("values_" + field);
   }
 }