diff --git a/app/javascript/vue/repository_filter/container.vue b/app/javascript/vue/repository_filter/container.vue
index 001c52d5e..bce29ed67 100644
--- a/app/javascript/vue/repository_filter/container.vue
+++ b/app/javascript/vue/repository_filter/container.vue
@@ -21,11 +21,11 @@
       </div>
     </div>
     <FiltersList 
-      :filters.sync="filters" 
-      :my_modules.sync="my_modules" 
-      :key="filterListKey"
-      v-on:update-filter="updateFilter"
-      v-on:delete-filter="deleteFilter" />
+      :filters="filters" 
+      :my_modules="my_modules" 
+      :key="filterListKey ? 1 : 0"
+      @filter:update="updateFilter"
+      @filter:delete="deleteFilter" />
     <div class="footer">
       <div id="filtersColumnsDropdown" class="dropup filters-columns-dropdown" @click="toggleColumnsFilters">
         <button class="btn btn-secondary add-filter prevent-shrink" >
@@ -42,7 +42,7 @@
           />
         </div>
       </div>
-      <button class="btn btn-light clear-filters-btn prevent-shrink" @click="clearFilters()">
+      <button class="btn btn-light clear-filters-btn prevent-shrink" @click="clearFilters">
         {{ i18n.t('repositories.show.filters.clear') }}
       </button>
       <button @click="$emit('filters:apply')" class="btn btn-primary apply-button prevent-shrink">
diff --git a/app/javascript/vue/repository_filter/filters_list.vue b/app/javascript/vue/repository_filter/filters_list.vue
index 84ed05b50..99754b603 100644
--- a/app/javascript/vue/repository_filter/filters_list.vue
+++ b/app/javascript/vue/repository_filter/filters_list.vue
@@ -3,10 +3,10 @@
     <FilterElement
       v-for="(filter, index) in filters"
       :key="filter.id"
-      :filter="filters[index]"
-      :my_modules="my_modules"
-      @filter:update="$emit('update-filter', filter)"
-      @filter:delete="$emit('delete-filter', index)"
+      :filter.sync="filters[index]"
+      :my_modules.sync="my_modules"
+      @filter:update="updateFilter"
+      @filter:delete="$emit('filter:delete', index)"
     />
   </div>
 </template>
@@ -22,5 +22,10 @@
       my_modules: Array,
     },
     components: {FilterElement},
+    methods: {
+      updateFilter(value) {
+        this.$emit('filter:update', value)
+      }
+    }
   }
 </script>