diff --git a/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html b/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html
index 521f6d3aa..5b0b69bb3 100644
--- a/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html
+++ b/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html
@@ -60,7 +60,7 @@
 </ng-template>
 
 <ng-template #queryExpression let-query="query">
-  <div class="d-flex flex-column">
+  <div class="d-flex flex-column border border-primary rounded p-2 mt-2">
     <div class="btn-group btn-group-xs flex-fill" 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>
@@ -69,7 +69,7 @@
       <input [(ngModel)]="query.operator" type="radio" class="btn-check" id="logicalOperatorNot_{{query.field}}" name="logicalOperatorNot_{{query.field}}" value="NOT">
       <label class="btn btn-outline-primary" for="logicalOperatorNot_{{query.field}}" i18n>Not</label>
     </div>
-    <div class="border border-1 border-primary rounded p-2 mt-2">
+    <div class="list-group list-group-flush">
       @for (subquery of query.value; track subquery; let i = $index) {
         <div class="list-group-item px-0 d-flex">
           @switch (subquery.type) {