diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml
index 2fc9169e38..f9f6cd5f5d 100644
--- a/resources/qml/MonitorButton.qml
+++ b/resources/qml/MonitorButton.qml
@@ -48,7 +48,13 @@ Rectangle
     {
         if(!printerConnected || !printerAcceptsCommands)
             return UM.Theme.getColor("text");
-
+        if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
+        {
+            return UM.Theme.getColor("status_busy");
+        } else if (Cura.MachineManager.printerOutputDevices[0].printerState == "error")
+        {
+            return UM.Theme.getColor("status_stopped");
+        }
         switch(Cura.MachineManager.printerOutputDevices[0].jobState)
         {
             case "printing":
@@ -80,6 +86,11 @@ Rectangle
             return catalog.i18nc("@label:MonitorStatus", "Printer does not accept commands");
 
         var printerOutputDevice = Cura.MachineManager.printerOutputDevices[0]
+
+        if(printerOutputDevice.printerState == "maintenance")
+        {
+            return catalog.i18nc("@label:MonitorStatus", "Printer is in maintenance mode.");
+        }
         switch(printerOutputDevice.jobState)
         {
             case "offline":
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index aa51fcfefe..b76a41fc37 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -112,6 +112,11 @@ Rectangle
                     else if(!printerAcceptsCommands)
                         return UM.Theme.getIcon("tab_monitor_unknown");
 
+                    if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
+                    {
+                        return UM.Theme.getIcon("tab_monitor_busy");
+                    }
+
                     switch(Cura.MachineManager.printerOutputDevices[0].jobState)
                     {
                         case "printing":