diff --git a/app/static/js/corpus-analysis/query-builder/query-builder.js b/app/static/js/corpus-analysis/query-builder/query-builder.js
index adca9e13..5098b684 100644
--- a/app/static/js/corpus-analysis/query-builder/query-builder.js
+++ b/app/static/js/corpus-analysis/query-builder/query-builder.js
@@ -361,6 +361,9 @@ nopaque.corpus_analysis.query_builder.QueryBuilder = class QueryBuilder {
         isEditable = false;
       }
       this.submitQueryChipElement(chipElement['type'], chipElement['pretty'], chipElement['query'], null, isClosingTag, isEditable);
+      if (isClosingTag) {
+        this.lockClosingChipElement(this.elements.queryChipElements[this.elements.queryChipElements.length-1]);
+      }
     }
   }