diff --git a/src/components/Controls/Select.vue b/src/components/Controls/Select.vue
index 372217bc8..632215304 100644
--- a/src/components/Controls/Select.vue
+++ b/src/components/Controls/Select.vue
@@ -60,7 +60,7 @@
             absolute
             z-10
             mt-4
-            w-full
+            w-60
             bg-white
             dark:bg-gray-850
             border border-gray-300
@@ -89,10 +89,10 @@
                 dark:hover:bg-gray-875
                 flex
               "
-              :class="value !== option.value ? 'pl-6' : 'pl-2'"
+              :class="selectValue !== option.label ? 'pl-6' : 'pl-2'"
             >
               <svg
-                v-if="value === option.value"
+                v-if="selectValue === option.label"
                 xmlns="http://www.w3.org/2000/svg"
                 x="0px"
                 y="0px"
@@ -127,9 +127,15 @@ export default defineComponent({
   data() {
     return {
       dropdownVisible: false,
-      selectValue: '',
+      selectValue: this.value,
     };
   },
+  props: {
+    closeDropDown: {
+      type: Boolean,
+      default: true,
+    },
+  },
   computed: {
     options(): SelectOption[] {
       if (this.df.fieldtype !== 'Select') {
@@ -141,15 +147,19 @@ export default defineComponent({
   },
   methods: {
     toggleDropdown() {
-      if (!this.isReadOnly) {
+      if (!this.closeDropDown) {
+        this.dropdownVisible = true;
+      } else if (!this.isReadOnly) {
         this.dropdownVisible = !this.dropdownVisible;
       }
     },
     selectOption(option: SelectOption) {
-      this.dropdownVisible = false;
       this.selectValue = option.label;
       this.triggerChange(option.value);
-      this.dropdownVisible = !this.dropdownVisible;
+
+      if (this.closeDropDown) {
+        this.dropdownVisible = !this.dropdownVisible;
+      }
     },
   },
 });
diff --git a/src/components/FilterDropdown.vue b/src/components/FilterDropdown.vue
index 8f3cc46d1..59068f9a6 100644
--- a/src/components/FilterDropdown.vue
+++ b/src/components/FilterDropdown.vue
@@ -73,7 +73,8 @@
                     options: fieldOptions,
                   }"
                   :value="filter.fieldname"
-                  @change="(value) => (filter.fieldname = value)"
+                  :close-drop-down="false"
+                  @change="(value) => updateNewFilters(i, 'fieldname', value)"
                 />
                 <Select
                   :border="true"
@@ -87,7 +88,8 @@
                     options: conditions,
                   }"
                   :value="filter.condition"
-                  @change="(value) => (filter.condition = value)"
+                  :close-drop-down="false"
+                  @change="(value) => updateNewFilters(i, 'condition', value)"
                 />
                 <Data
                   :border="true"
@@ -100,7 +102,8 @@
                     fieldtype: 'Data',
                   }"
                   :value="String(filter.value)"
-                  @change="(value) => (filter.value = value)"
+                  :close-drop-down="false"
+                  @change="(value) => updateNewFilters(i, 'value', value)"
                 />
               </div>
             </div>
@@ -180,8 +183,9 @@ export default defineComponent({
   emits: ['change'],
   data() {
     return {
-      filters: [],
-    } as { filters: Filter[] };
+      filters: [] as Filter[],
+      newFilters: [] as Filter[],
+    };
   },
   computed: {
     fields(): Field[] {
@@ -250,12 +254,22 @@ export default defineComponent({
       implicit?: boolean
     ): void {
       this.filters.push({ fieldname, condition, value, implicit: !!implicit });
+      this.newFilters.push({
+        fieldname,
+        condition,
+        value,
+        implicit: !!implicit,
+      });
     },
     removeFilter(filter: Filter): void {
       this.filters = this.filters.filter((f) => f !== filter);
     },
+    updateNewFilters(index: number, key: keyof Filter, value: Filter['value']) {
+      this.newFilters![index][key] = value;
+    },
     setFilter(filters: QueryFilter, implicit?: boolean): void {
       this.filters = [];
+      this.newFilters = [];
 
       Object.keys(filters).map((fieldname) => {
         let parts = filters[fieldname];
@@ -277,7 +291,7 @@ export default defineComponent({
     },
     emitFilterChange(): void {
       const filters: Record<string, [Condition, Filter['value']]> = {};
-      for (const { condition, value, fieldname } of this.filters) {
+      for (const { condition, value, fieldname } of this.newFilters) {
         if (value === '' && condition) {
           continue;
         }
@@ -286,6 +300,22 @@ export default defineComponent({
       }
 
       this.$emit('change', filters);
+      if (this.newFilters.length) {
+        this.filters = this.filters.filter(
+          (filter) => filter.condition && filter.value && filter.fieldname
+        );
+
+        this.filters.push(this.newFilters[this.newFilters.length - 1]);
+      }
+
+      this.filters = Array.from(
+        new Map(
+          this.filters.map((filter) => [
+            `${filter.condition}-${filter.value}-${filter.fieldname}`,
+            filter,
+          ])
+        ).values()
+      );
     },
   },
 });