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 329ed31a245..e5063da6fd9 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
@@ -17,10 +17,10 @@
   @filterUnselected={{this.filterUnselected}}
   @closeModal={{@closeModal}}
 >
-  <form class="sidebar-tags-form">
-    {{#if this.tagsLoading}}
-      <div class="spinner"></div>
-    {{else}}
+  {{#if this.tagsLoading}}
+    {{loading-spinner size="large"}}
+  {{else}}
+    <form class="sidebar-tags-form">
       {{#if (gt this.tags.length 0)}}
         {{#each this.tags as |tag|}}
           <div
@@ -57,8 +57,8 @@
           {{i18n "sidebar.tags_form_modal.no_tags"}}
         </div>
       {{/if}}
-    {{/if}}
-  </form>
+    </form>
+  {{/if}}
 
   <ConditionalLoadingSpinner @condition={{this.tags.loadingMore}} />
 </Sidebar::EditNavigationMenu::Modal>
\ No newline at end of file