diff --git a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
index 98b41e3d6..839b54357 100644
--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
@@ -62,7 +62,7 @@
 </ng-template>
 
 <ng-template #queryExpression let-query="query">
-  <div class="d-flex flex-column border border-primary rounded px-2 pt-2">
+  <div class="d-flex flex-column border border-primary rounded px-2 pt-2 w-100">
     <div class="btn-group btn-group-xs" role="group">
       <input [(ngModel)]="query.operator" type="radio" class="btn-check" id="logicalOperatorAnd_{{query.field}}" name="logicalOperatorAnd_{{query.field}}" value="AND">
       <label class="btn btn-outline-primary" for="logicalOperatorAnd_{{query.field}}" i18n>And</label>
diff --git a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
index 7a95b006f..942330915 100644
--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
+++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
@@ -55,9 +55,15 @@ export class CustomFieldQueriesModel {
       if (this.queries[0].type === CustomFieldQueryElementType.Atom) {
         expression.value = this.queries as CustomFieldQueryAtom[]
         this.queries = []
+        this.queries.push(expression)
+      } else {
+        ;((this.queries[0] as CustomFieldQueryExpression).value as any[]).push(
+          expression
+        )
       }
+    } else {
+      this.queries.push(expression)
     }
-    this.queries.push(expression)
     expression.changed.subscribe(() => {
       this.changed.next(this)
     })