diff --git a/plinth/modules/diagnostics/templates/diagnostics_button.html b/plinth/modules/diagnostics/templates/diagnostics_button.html
new file mode 100644
index 000000000..048d679b6
--- /dev/null
+++ b/plinth/modules/diagnostics/templates/diagnostics_button.html
@@ -0,0 +1,25 @@
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+{% endcomment %}
+
+<form class="form form-diagnostics-button" method="post"
+      action="{% url 'diagnostics:module' module %}">
+  {% csrf_token %}
+
+  <input type="submit" class="btn btn-default" value="Run Diagnostics"/>
+</form>
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index a29aea31d..797316777 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -17,6 +17,10 @@ body {
     margin-bottom: 20px;
 }
 
+.running-status-parent {
+    display: inline-block;
+}
+
 .running-status {
     border-radius: 50%;
     border: 1px solid black;
@@ -33,6 +37,10 @@ body {
     background-color: rgb(228, 66, 66);
 }
 
+.form-diagnostics-button {
+    display: inline-block;
+}
+
 /* Hide log out button if user dropdown is available */
 .js #logout-nojs {
     display: none;