diff --git a/js/src/database/multi_table_query.js b/js/src/database/multi_table_query.js
index bd078de5d7..4a293c97b6 100644
--- a/js/src/database/multi_table_query.js
+++ b/js/src/database/multi_table_query.js
@@ -195,7 +195,10 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
         $('.criteria_col').each(function () {
             $(this).on('change', function () {
                 var $anchor = $(this).siblings('.jsCriteriaButton').first();
-                if ($(this).is(':checked') && ! $anchor.hasClass('collapsed')) {
+                if (
+                    ($(this).is(':checked') && ! $anchor.hasClass('collapsed'))
+                    || (! $(this).is(':checked') && $anchor.hasClass('collapsed'))
+                ) {
                     // Do not collapse on checkbox tick as it does not make sense
                     // The user has it open and wants to tick the box
                     return;