diff --git a/pkg/api/api.go b/pkg/api/api.go
index ed73f2dc76d..4fa28f799b0 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -307,4 +307,5 @@ func Register(r *macaron.Macaron) {
 
 	InitAppPluginRoutes(r)
 
+	r.NotFound(NotFoundHandler)
 }
diff --git a/public/app/partials/error.html b/public/app/partials/error.html
index d38f71ac5d8..0401d6d98db 100644
--- a/public/app/partials/error.html
+++ b/public/app/partials/error.html
@@ -1,11 +1,12 @@
+<navbar title="404" icon="fa fa-fw fa-question" title-url="/">
+</navbar>
 
-<div class="row-fluid" style="margin-top: 100px;">
-	<div class="span2"></div>
+<div class="page-container">
 
-	<div class="grafana-info-box span8 text-center">
-			<h3>Page not found (404)</h3>
-		</div>
-
-	<div class="span2"></div>
+  <div class="page-header">
+    <h1>
+			Page not found (404)
+		</h1>
+	</div>
 
 </div>