diff --git a/panels/zcalibrate.py b/panels/zcalibrate.py
index 049c525e..e4b4fe29 100644
--- a/panels/zcalibrate.py
+++ b/panels/zcalibrate.py
@@ -244,7 +244,6 @@ class ZCalibratePanel(ScreenPanel):
                 logging.info(data)
             elif "save_config" in data:
                 self.buttons_not_calibrating()
-                self._screen.show_popup_message(_("Calibrated, save configuration to make it permanent"), level=1)
             elif "out of range" in data:
                 self._screen.show_popup_message(data)
                 self.buttons_not_calibrating()
diff --git a/screen.py b/screen.py
index 65f56a05..e722863b 100755
--- a/screen.py
+++ b/screen.py
@@ -727,7 +727,7 @@ class KlipperScreen(Gtk.Window):
                 elif "unknown" in data.lower() and \
                         not ("TESTZ" in data or "MEASURE_AXES_NOISE" in data or "ACCELEROMETER_QUERY" in data):
                     self.show_popup_message(data)
-                if "SAVE_CONFIG" in data and self.printer.state == "ready":
+                elif "SAVE_CONFIG" in data and self.printer.state == "ready":
                     script = {"script": "SAVE_CONFIG"}
                     self._confirm_send_action(
                         None,