diff --git a/OliverBooth/Pages/Blog/Index.cshtml b/OliverBooth/Pages/Blog/Index.cshtml
index e6081d9..d558cdf 100644
--- a/OliverBooth/Pages/Blog/Index.cshtml
+++ b/OliverBooth/Pages/Blog/Index.cshtml
@@ -41,7 +41,7 @@
     </div>
     <div class="card-footer">
         {{#each post.tags}}
-            <a href="?tag={{this}}" class="badge text-bg-dark">{{this}}</a>
+            <a href="?tag={{urlEncode this}}" class="badge text-bg-dark">{{this}}</a>
         {{/each}}
     </div>
 </script>
diff --git a/src/ts/app.ts b/src/ts/app.ts
index 39ee1f5..1fa8193 100644
--- a/src/ts/app.ts
+++ b/src/ts/app.ts
@@ -28,6 +28,8 @@ declare const Prism: any;
         }
     });
 
+    Handlebars.registerHelper("urlEncode", encodeURIComponent);
+
     function getQueryVariable(variable: string): string {
         const query = window.location.search.substring(1);
         const vars = query.split("&");