diff --git a/src/main.rs b/src/main.rs
index f95d7da..6b6efbb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -192,10 +192,7 @@ async fn post_feed(
             .get_result(conn)
             .expect("Error saving new feed")
     }).await.unwrap();
-    let mut res = FeedTemplate{ feed: result }.into_response();
-    // Trigger HTMX Update event
-    res.headers_mut().insert("HX-Trigger", HeaderValue::from_static("newFeed"));
-    res
+    FeedTemplate{ feed: result }
 }
 
 async fn put_feed(
diff --git a/templates/index.html b/templates/index.html
index 1347b1a..8eca924 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -44,7 +44,8 @@
         <header>
             <h2>Create new RSS Feed subscription</h2>
         </header>
-        <form id="create_form" hx-post="/feed/" hx-swap="none" x-ref="create_form" hx-indicator="#indicator">
+        <form id="create_form" hx-post="/feed/" hx-target="#feed_tbody" hx-swap="beforeend" hx-indicator="#indicator"
+              @htmx:after-on-load="document.getElementById('create_form').reset();isModalOpen = false">
             <label>
                 Name
                 <input type="text" name="name">
@@ -71,7 +72,7 @@
             <th>Actions</th>
         </tr>
         </thead>
-        <tbody hx-get="/feed/" hx-trigger="newFeed from:body" @htmx:after-settle="isModalOpen = false;$refs['create_form'].reset()">
+        <tbody id="feed_tbody">
         {{ feeds|safe }}
         </tbody>
     </table>