diff --git a/templates/media_list.pages.tmpl b/templates/media_list.pages.tmpl
index 0a1a91f..bf563b1 100644
--- a/templates/media_list.pages.tmpl
+++ b/templates/media_list.pages.tmpl
@@ -1,6 +1,7 @@
-<section class="section">
+<section class="section"
+         hx-on="htmx:request:document.getElementById('loading-spinner').style.display = 'block'; htmx:afterRequest:document.getElementById('loading-spinner').style.display = 'none'">
   <div class="container">
-    <!-- Spinner (indicator) -->
+    <!-- Spinner -->
     <div id="loading-spinner" class="has-text-centered" style="display:none;">
       <button class="button is-loading is-white is-large" aria-label="Loading"></button>
     </div>
@@ -11,8 +12,7 @@
         {{if .CurrentSub}}
         <li>
           <a hx-get="/api/paths/{{.PathID}}/media"
-             hx-target="#content" hx-swap="innerHTML"
-             hx-indicator="#loading-spinner">
+             hx-target="#content" hx-swap="innerHTML">
             🔙 Racine
           </a>
         </li>
@@ -29,8 +29,7 @@
         <div class="card">
           <div class="card-content has-text-centered">
             <a hx-get="/api/paths/{{$.PathID}}/media?sub={{.SubPath | urlquery}}"
-               hx-target="#content" hx-swap="innerHTML"
-               hx-indicator="#loading-spinner">
+               hx-target="#content" hx-swap="innerHTML">
               <span class="icon is-large">
                 <i class="fas fa-folder fa-2x"></i>
               </span>
@@ -52,16 +51,14 @@
           <div class="card-image">
             <figure class="image is-4by3">
               <a hx-get="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}"
-                 hx-target="#content" hx-swap="innerHTML"
-                 hx-indicator="#loading-spinner">
+                 hx-target="#content" hx-swap="innerHTML">
                 <img src="{{.ThumbURL}}" alt="{{.Title}}">
               </a>
             </figure>
           </div>
           <div class="card-content">
             <a hx-get="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}"
-               hx-target="#content" hx-swap="innerHTML"
-               hx-indicator="#loading-spinner">
+               hx-target="#content" hx-swap="innerHTML">
               <p class="title is-6 is-clipped">{{.Title}}</p>
               {{if .DurationFmt}}
               <p class="subtitle is-7">{{.DurationFmt}}</p>