diff --git a/plinth/modules/diagnostics/diagnostics.py b/plinth/modules/diagnostics/diagnostics.py
index 9cf36ca49..72cf2018f 100644
--- a/plinth/modules/diagnostics/diagnostics.py
+++ b/plinth/modules/diagnostics/diagnostics.py
@@ -45,6 +45,7 @@ def index(request):
     return TemplateResponse(
         request, 'diagnostics.html', {
             'title': diagnostics.name,
+            'name': diagnostics.name,
             'description': diagnostics.description,
             'is_running': _running_task is not None,
             'manual_page': diagnostics.manual_page,
diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html
index cec18866f..082d3a761 100644
--- a/plinth/modules/diagnostics/templates/diagnostics.html
+++ b/plinth/modules/diagnostics/templates/diagnostics.html
@@ -1,4 +1,4 @@
-{% extends 'simple_app.html' %}
+{% extends 'app.html' %}
 {% comment %}
 #
 # This file is part of FreedomBox.