diff --git a/templates/_file_list.pages.tmpl b/templates/_file_list.pages.tmpl
index fa40dd7..40f82ac 100644
--- a/templates/_file_list.pages.tmpl
+++ b/templates/_file_list.pages.tmpl
@@ -5,6 +5,7 @@
          hx-get="{{ if .IsDir }}/folders?path={{ urlquery .Path }}{{ else }}/folders/detail?path={{ urlquery .Path }}{{ end }}"
          hx-target="{{ if .IsDir }}#content{{ else }}#test{{ end }}"
          hx-push-url="true"
+         hx-swap-oob="beforeend"
          style="cursor:pointer">
       <div class="card-image">
         <figure class="image is-4by3">
diff --git a/templates/folders.pages.tmpl b/templates/folders.pages.tmpl
index cf5e6de..9b65c75 100644
--- a/templates/folders.pages.tmpl
+++ b/templates/folders.pages.tmpl
@@ -14,6 +14,7 @@
                 <a
                   hx-get="/folders?path={{ urlquery .Name }}"
                   hx-target="#file-list"
+                  hx-swap-oob="beforeend"
                   hx-push-url="true"
                   class="{{ if eq $.CurrentPath .Name }}is-active{{ end }}"
                 >
@@ -34,6 +35,7 @@
                   hx-get="/folders"
                   hx-target="#file-list"
                   hx-push-url="true"
+                  hx-swap-oob="beforeend"
                 >
                   Home
                 </a>
@@ -48,6 +50,7 @@
                       hx-get="/folders?path={{ urlquery (trimPrefix "/" $acc) }}"
                       hx-target="#file-list"
                       hx-push-url="true"
+                      hx-swap-oob="beforeend"
                     >
                       {{ $p }}
                     </a>
@@ -62,8 +65,9 @@
             hx-trigger="load"
             hx-get="/folders?path={{ urlquery .CurrentPath }}"
             hx-target="#file-list"
+            hx-swap-oob="beforeend"
           >
-            {{ template "_file_list.pages.tmpl" . }}
+            <!-- {{ template "_file_list.pages.tmpl" . }} -->
           </div>
         </div>