diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp
index 8b10e1198a..6d775f66cf 100644
--- a/src/slic3r/GUI/Calibration.cpp
+++ b/src/slic3r/GUI/Calibration.cpp
@@ -158,7 +158,7 @@ void CalibrationDialog::on_dpi_changed(const wxRect &suggested_rect) {}
 void CalibrationDialog::update_cali(MachineObject *obj)
 {
     if (!obj) return;
-    if (obj->is_in_calibration() || obj->is_calibration_done()) {
+    if (obj->is_calibration_running() || obj->is_calibration_done()) {
         if (obj->is_calibration_done()) {
             m_calibration_btn->Enable();
             m_calibration_btn->SetLabel(_L("Completed"));
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index 0f5b282a7b..484754cb46 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -1775,7 +1775,7 @@ void StatusPanel::update_cali(MachineObject *obj)
 {
     if (!obj) return;
 
-    if (obj->is_in_calibration()) {
+    if (obj->is_calibration_running()) {
         m_calibration_btn->SetLabel(_L("Calibrating"));
         if (calibration_dlg && calibration_dlg->IsShown()) {
             m_calibration_btn->Disable();
@@ -1851,7 +1851,8 @@ void StatusPanel::update_subtask(MachineObject *obj)
 {
     if (!obj) return;
 
-    if (obj->is_system_printing()) {
+    if (obj->is_system_printing()
+        || obj->is_in_calibration()) {
         reset_printing_values();
     } else if (obj->is_in_printing() || obj->print_status == "FINISH") {
         if (obj->is_in_prepare()) {