diff --git a/pronterface.py b/pronterface.py
index a3bd0ee..44f7034 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -133,8 +133,11 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         wx.CallAfter(self.connectbtn.Disable)
         for i in self.printerControls:
             wx.CallAfter(i.Enable)
+
+        # Enable XYButtons and ZButtons
         self.xyb.enable()
         self.zb.enable()
+
         if self.filename:
             wx.CallAfter(self.printbtn.Enable)
         
@@ -1313,6 +1316,10 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         wx.CallAfter(self.pausebtn.Disable);
         for i in self.printerControls:
             wx.CallAfter(i.Disable)
+
+        # Disable XYButtons and ZButtons
+        self.xyb.disable()
+        self.zb.disable()
         
         if self.paused:
             self.p.paused=0
diff --git a/xybuttons.py b/xybuttons.py
index 9d58866..09f4659 100644
--- a/xybuttons.py
+++ b/xybuttons.py
@@ -47,9 +47,11 @@ class XYButtons(BufferedCanvas):
     
     def disable(self):
         self.enabled = False
+        self.update()
     
     def enable(self):
         self.enabled = True
+        self.update()
     
     def distanceToLine(self, pos, x1, y1, x2, y2):
         xlen = x2 - x1
diff --git a/zbuttons.py b/zbuttons.py
index 39e2181..1d72cd7 100644
--- a/zbuttons.py
+++ b/zbuttons.py
@@ -33,9 +33,11 @@ class ZButtons(BufferedCanvas):
 
     def disable(self):
         self.enabled = False
+        self.update()
     
     def enable(self):
         self.enabled = True
+        self.update()
 
     def lookupRange(self, ydist):
         idx = -1