diff --git a/app/controllers/catch-all.js b/app/controllers/catch-all.js
index 7fc0a8dcb3c..373abce0397 100644
--- a/app/controllers/catch-all.js
+++ b/app/controllers/catch-all.js
@@ -2,8 +2,11 @@ import Controller from '@ember/controller';
 import { action } from '@ember/object';
 
 export default class CatchAllController extends Controller {
-  @action reload(event) {
-    event.preventDefault();
+  @action reload() {
     this.model.transition.retry();
   }
+
+  @action back() {
+    history.back();
+  }
 }
diff --git a/app/styles/application.module.css b/app/styles/application.module.css
index efb93c4e188..65ed02bd9c3 100644
--- a/app/styles/application.module.css
+++ b/app/styles/application.module.css
@@ -57,9 +57,10 @@ h1 {
     }
 }
 
-a {
+a, .link {
     color: var(--link-color);
     text-decoration: none;
+    cursor: pointer;
 
     &:hover {
         color: var(--link-hover-color);
diff --git a/app/styles/catch-all.module.css b/app/styles/catch-all.module.css
index 61ea0fd12fd..c736c5b866f 100644
--- a/app/styles/catch-all.module.css
+++ b/app/styles/catch-all.module.css
@@ -15,5 +15,7 @@
 }
 
 .link {
+    composes: button-reset from '../styles/shared/buttons.module.css';
+    composes: link from '../styles/application.module.css';
     font-weight: 500;
 }
diff --git a/app/templates/catch-all.hbs b/app/templates/catch-all.hbs
index 7018d397f8d..e898155870b 100644
--- a/app/templates/catch-all.hbs
+++ b/app/templates/catch-all.hbs
@@ -5,9 +5,9 @@
     <h1 local-class="title" data-test-title>{{or @model.title "Page not found"}}</h1>
 
     {{#if @model.tryAgain}}
-      <a href="javascript:location.reload()" local-class="link" data-test-try-again {{on "click" this.reload}}>Try Again</a>
+      <button type="button" local-class="link" data-test-try-again {{on "click" this.reload}}>Try Again</button>
     {{else}}
-      <a href="javascript:history.back()" local-class="link" data-test-go-back>Go Back</a>
+      <button type="button" local-class="link" data-test-go-back {{on "click" this.back}}>Go Back</button>
     {{/if}}
   </div>
 </div>
\ No newline at end of file