diff --git a/src/reader/_app/v2/__init__.py b/src/reader/_app/v2/__init__.py
index 5ed213b7..f63bafcf 100644
--- a/src/reader/_app/v2/__init__.py
+++ b/src/reader/_app/v2/__init__.py
@@ -73,8 +73,10 @@ def mark_as():
 
     if request.headers.get('hx-request') == 'true':
         return render_block(
-            'v2/entries.html', 'entry_form', entry=reader.get_entry(entry)
+            'v2/entries.html',
+            'entry_form',
+            entry=reader.get_entry(entry),
+            next=request.form['next'],
         )
 
-    print(request.form['next'])
     return redirect(request.form['next'], code=303)
diff --git a/src/reader/_app/v2/static/style.css b/src/reader/_app/v2/static/style.css
index 20285ee7..9b074961 100644
--- a/src/reader/_app/v2/static/style.css
+++ b/src/reader/_app/v2/static/style.css
@@ -15,3 +15,13 @@
 .nav.controls .nav-link.active {
   color: var(--bs-navbar-active-color);
 }
+
+.htmx-indicator {
+  display: none;
+}
+.htmx-request .htmx-indicator, .htmx-request.htmx-indicator {
+  display: inline-block;
+}
+.htmx-request .label, .htmx-request.label {
+  display: none;
+}
diff --git a/src/reader/_app/v2/templates/v2/entries.html b/src/reader/_app/v2/templates/v2/entries.html
index 4f254275..73e4510c 100644
--- a/src/reader/_app/v2/templates/v2/entries.html
+++ b/src/reader/_app/v2/templates/v2/entries.html
@@ -95,48 +95,74 @@ <h2 class="h5 mb-1" style="font-size: 1.125rem">
   </p>
   {% endif %}
 
-  {% set next = loop.index if not loop.last else loop.index - 1 -%}
+  {% set next_index = loop.index if not loop.last else loop.index - 1 -%}
+  {% set next = url_for('.entries', **request.args) + '#entry-' + (next_index|string) %}
   <form action="{{ url_for('.mark_as') }}" method="post"
-    hx-post="{{ url_for('.mark_as') }}"
+    hx-target="closest form"
+
     class="my-2">
     {#- TODO: aria stuff #}
     {% block entry_form scoped %}
 
     <button type="submit" name="read"
       value="{{ 'false' if entry.read else 'true' }}"
+      hx-post="{{ url_for('.mark_as') }}"
+      hx-disabled-elt="this"
       class="btn btn-outline-secondary btn-sm{% if entry.read %} active{% endif %}"
       {% if entry.read -%}
       aria-pressed="true"
       {% endif -%}
       style="width: 4rem">
-      <i class="bi {{
+
+      <i class="label bi {{
         'bi-check-circle-fill' if entry.read is true else 'bi-check-lg'
       }}"></i>
+
+      <div class="spinner-border htmx-indicator" role="status" style="width: 0.875rem; height: 0.875rem;">
+        <span class="visually-hidden">loading...</span>
+      </div>
+
     </button>
 
     <div class="btn-group" role="group" aria-label="importance">
       <button type="submit" name="important"
         value="{{ 'none' if entry.important is true else 'true' }}"
+        hx-post="{{ url_for('.mark_as') }}"
+        hx-disabled-elt="this, next button"
         class="btn btn-outline-secondary btn-sm {% if entry.important is true %} active{% endif %}"
         {% if entry.important is true -%}
         aria-pressed="true"
         {% endif -%}
         style="width: 2rem">
-        <i class="bi {{
+
+        <i class="label bi {{
           'bi-star-fill' if entry.important is true else 'bi-star'
         }}"></i>
+
+        <div class="spinner-border htmx-indicator" role="status" style="width: 0.875rem; height: 0.875rem;">
+          <span class="visually-hidden">loading...</span>
+        </div>
+
       </button>
 
       <button type="submit" name="important"
         value="{{ 'none' if entry.important is false else 'false' }}"
+        hx-post="{{ url_for('.mark_as') }}"
+        hx-disabled-elt="this, previous button"
         class="btn btn-outline-secondary btn-sm {% if entry.important is false %} active{% endif %}"
         {% if entry.important is false -%}
         aria-pressed="true"
         {% endif -%}
         style="width: 2rem">
-        <i class="bi {{
+
+        <i class="label bi {{
           'bi-arrow-down-circle-fill' if entry.important is false else 'bi-arrow-down'
         }}"></i>
+
+        <div class="spinner-border htmx-indicator" role="status" style="width: 0.875rem; height: 0.875rem;">
+          <span class="visually-hidden">loading...</span>
+        </div>
+
       </button>
     </div>
 
@@ -152,11 +178,7 @@ <h2 class="h5 mb-1" style="font-size: 1.125rem">
 
     <input type="hidden" name="feed-url" value="{{ entry.feed_url }}">
     <input type="hidden" name="entry-id" value="{{ entry.id }}">
-
-    {% if next -%}
-    <input type="hidden" name="next"
-      value="{{ url_for('.entries', **request.args) }}#entry-{{ next }}">
-    {%- endif %}
+    <input type="hidden" name="next" value="{{ next }}">
 
   {% endblock %}
   </form>