diff --git a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js
index cc9d550c44..66aa1b2a04 100644
--- a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js
+++ b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js
@@ -84,7 +84,7 @@ export class PathSelectorTable {
   async reloadTable(url) {
     try {
       $(this.tableWrapper()).hide();
-      $('#loading-icon').show();
+      $(this).closest('.loading-icon').show();
       const response = await fetch(url, { headers: { 'Accept': 'application/json' }, cache: 'no-store' });
       const data = await this.dataFromJsonResponse(response);
       $(`#${this.breadcrumbId}`).html(data.path_selector_breadcrumbs_html);
@@ -104,7 +104,7 @@ export class PathSelectorTable {
   }
 
   resetTable() {
-    $('#loading-icon').hide();
+    $(this).closest(".loading-icon").hide();
     $(this.tableWrapper()).show();
     $('#forbidden-warning').addClass('d-none');
   }
diff --git a/apps/dashboard/app/views/shared/_path_selector_table.html.erb b/apps/dashboard/app/views/shared/_path_selector_table.html.erb
index 127159f2c8..7a91c3098f 100644
--- a/apps/dashboard/app/views/shared/_path_selector_table.html.erb
+++ b/apps/dashboard/app/views/shared/_path_selector_table.html.erb
@@ -45,7 +45,7 @@
               </div>
 
               <div class="d-flex justify-content-center">
-                <div id="loading-icon" class="spinner-border rem-5" role="status">
+                <div class="loading-icon spinner-border rem-5" role="status">
                   <span class="sr-only">Loading...</span> 
                 </div>
               </div>