diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.html
index 3d163fd..4c48f3d 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.html
@@ -228,7 +228,7 @@
                 <select [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" class="clr-select">
                   <option value="">Select Field</option>
                   <!-- Use columnData for base API filters when drilldown is not enabled, drilldownColumnData when it is -->
-                  <option *ngFor="let column of (gadgetsEditdata.drilldownEnabled ? drilldownColumnData : columnData)" [value]="column">{{column}}</option>
+                  <option *ngFor="let column of getAvailableFields(gadgetsEditdata.baseFilters, i, gadgetsEditdata.drilldownEnabled ? drilldownColumnData : columnData)" [value]="column">{{column}}</option>
                 </select>
               </div>
               
@@ -343,7 +343,7 @@
               <div class="clr-col-sm-5">
                 <select [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" class="clr-select">
                   <option value="">Select Field</option>
-                  <option *ngFor="let column of drilldownColumnData" [value]="column">{{column}}</option>
+                  <option *ngFor="let column of getAvailableFields(gadgetsEditdata.baseFilters, i, drilldownColumnData)" [value]="column">{{column}}</option>
                 </select>
               </div>
               
@@ -472,7 +472,7 @@
                   <div class="clr-col-sm-5">
                     <select [(ngModel)]="filter.field" [ngModelOptions]="{standalone: true}" class="clr-select">
                       <option value="">Select Field</option>
-                      <option *ngFor="let column of layerColumnData[i] || []" [value]="column">{{column}}</option>
+                      <option *ngFor="let column of getAvailableFields(layer.filters, j, layerColumnData[i] || [])" [value]="column">{{column}}</option>
                     </select>
                   </div>
                   
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.ts
index 3b758f1..3412715 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/editnewdash/editnewdash.component.ts
@@ -319,7 +319,21 @@ export class EditnewdashComponent implements OnInit {
       });
     });
   }
-
+  // Add method to get available fields for a filter dropdown (excluding already selected fields)
+  getAvailableFields(filters: any[], currentIndex: number, allFields: string[]): string[] {
+    if (!filters || !allFields) {
+      return allFields || [];
+    }
+    
+    // Get all selected fields except the current one
+    const selectedFields = filters
+      .filter((filter, index) => filter.field && index !== currentIndex)
+      .map(filter => filter.field);
+      
+    // Return fields that haven't been selected yet
+    return allFields.filter(field => !selectedFields.includes(field));
+  }
+  
   itemChange() {
     this.dashboardCollection.dashboard = this.dashboardArray;
     console.log("itemChange this.dashboardCollection.dashboard ", this.dashboardCollection.dashboard);