diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py
index 19e8efa7..693f24bb 100644
--- a/src/octoprint/server/views.py
+++ b/src/octoprint/server/views.py
@@ -271,7 +271,7 @@ def _process_templates():
 	first_run = settings().getBoolean(["server", "firstRun"])
 	enable_gcodeviewer = settings().getBoolean(["gcodeViewer", "enabled"])
 	enable_timelapse = (settings().get(["webcam", "snapshot"]) and settings().get(["webcam", "ffmpeg"]))
-	enable_systemmenu = settings().get(["system"]) is not None and settings().get(["system", "actions"]) is not None and len(settings().get(["system", "actions"])) > 0
+	enable_systemmenu = settings().get(["system"]) is not None and settings().get(["system", "actions"]) is not None
 	preferred_stylesheet = settings().get(["devel", "stylesheet"])
 
 	##~~ prepare templates
diff --git a/src/octoprint/templates/navbar/systemmenu.jinja2 b/src/octoprint/templates/navbar/systemmenu.jinja2
index 603d2a09..00ac9448 100644
--- a/src/octoprint/templates/navbar/systemmenu.jinja2
+++ b/src/octoprint/templates/navbar/systemmenu.jinja2
@@ -1,4 +1,4 @@
-<a href="#" class="dropdown-toggle" data-toggle="dropdown">
+<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-bind="visible: system.systemActions().length > 0">
     <i class="icon-off"></i> {{ _('System') }}
     <b class="caret"></b>
 </a>