diff --git a/src/render.rs b/src/render.rs
index d0852fa39..ea198c31d 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -246,7 +246,8 @@ impl Handler<EditPostPage> for Renderer {
 }
 
 /// Message used to render search results
-#[derive(Serialize)]
+#[derive(Template)]
+#[template(path = "search.html")]
 pub struct SearchResultPage {
     pub query: String,
     pub results: Vec<SearchResult>,
@@ -257,6 +258,6 @@ impl Handler<SearchResultPage> for Renderer {
     type Result = Result<String>;
 
     fn handle(&mut self, msg: SearchResultPage, _: &mut Self::Context) -> Self::Result {
-        Ok(self.tera.render("search.html", &msg)?)
+        msg.render().map_err(|e| e.into())
     }
 }
diff --git a/templates/search.html b/templates/search.html
index 0ff49e508..a74b60e0a 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -44,7 +44,7 @@
                         <div class="mdl-card mdl-cell--6-col search-result mdl-shadow--2dp">
                             <div class="mdl-card__supporting-text">
                                 <p>Posted in '{{ result.title }}' by {{ result.author }}:</p>
-                                <p>{{ result.headline | safe }}</p>
+                                <p>{{ result.headline|safe }}</p>
                             </div>
                             <div class="mdl-card__actions mdl-card--border post-actions">
                                 <div class="mdl-layout-spacer"></div>