diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb
index c5d14190e..18443de57 100644
--- a/app/views/queries/_columns.html.erb
+++ b/app/views/queries/_columns.html.erb
@@ -36,7 +36,7 @@
 <%= javascript_tag do %>
 $(document).ready(function(){
   $('.query-columns').closest('form').submit(function(){
-    $('#<%= selected_tag_id %> option').prop('selected', true);
+    $('#<%= selected_tag_id %> option:not(:disabled)').prop('selected', true);
   });
 });
 <% end %>