diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs
index 919b8520587..4d07b3621e5 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs
@@ -15,7 +15,7 @@
   @filterSelected={{this.filterSelected}}
   @filterUnselected={{this.filterUnselected}}
   @closeModal={{@closeModal}}
-  @loading={{this.tagsLoading}}
+  @loading={{(or this.tagsLoading this.disableFiltering)}}
   class="sidebar__edit-navigation-menu__tags-modal"
 >
   {{#if this.tagsLoading}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.js b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.js
index d1158bf86a2..4ddbc7e7eb9 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.js
@@ -16,6 +16,7 @@ export default class extends Component {
   @tracked onlyUnSelected = false;
   @tracked tags = [];
   @tracked tagsLoading;
+  @tracked disableFiltering;
   @tracked selectedTags = [...this.currentUser.sidebarTagNames];
 
   constructor() {
@@ -50,6 +51,7 @@ export default class extends Component {
       })
       .finally(() => {
         this.tagsLoading = false;
+        this.disableFiltering = false;
       });
   }
 
@@ -110,6 +112,7 @@ export default class extends Component {
 
   @action
   onFilterInput(filter) {
+    this.disableFiltering = true;
     discourseDebounce(this, this.#performFiltering, filter, INPUT_DELAY);
   }