diff --git a/panels/zcalibrate.py b/panels/zcalibrate.py
index 2729b36e..2f92ffdc 100644
--- a/panels/zcalibrate.py
+++ b/panels/zcalibrate.py
@@ -63,7 +63,7 @@ class Panel(ScreenPanel):
                                        _("Are you sure you want to stop the calibration?"),
                                        "printer.gcode.script", script)
 
-        self.labels['popover'] = Gtk.Popover(position=Gtk.PositionType.BOTTOM)
+        self.popover = Gtk.Popover(position=Gtk.PositionType.BOTTOM)
 
         self.set_functions()
 
@@ -148,7 +148,7 @@ class Panel(ScreenPanel):
             self._add_button("Axis Twist Compensation", "axis_twist", pobox)
             functions.append("axis_twist")
 
-        self.labels['popover'].add(pobox)
+        self.popover.add(pobox)
         if len(functions) > 1:
             self.buttons['start'].connect("clicked", self.on_popover_clicked)
         else:
@@ -165,11 +165,11 @@ class Panel(ScreenPanel):
         pobox.pack_start(popover_button, True, True, 5)
 
     def on_popover_clicked(self, widget):
-        self.labels['popover'].set_relative_to(widget)
-        self.labels['popover'].show_all()
+        self.popover.set_relative_to(widget)
+        self.popover.show_all()
 
     def start_calibration(self, widget, method):
-        self.labels['popover'].popdown()
+        self.popover.popdown()
         self.buttons['start'].set_sensitive(False)
         if self._printer.get_stat("toolhead", "homed_axes") != "xyz":
             self._screen._ws.klippy.gcode_script("G28")