diff --git a/Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/librecaldialog.cpp b/Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/librecaldialog.cpp
index eea2a1c..9deae22 100644
--- a/Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/librecaldialog.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/librecaldialog.cpp
@@ -607,6 +607,7 @@ void LibreCALDialog::startCalibration()
     connect(cal, &Calibration::measurementsUpdated, this, startNextCalibrationStep, Qt::QueuedConnection);
     connect(cal, &Calibration::measurementsAborted, this, [=](){
         enableUI();
+        ui->lCalibrationStatus->setText("Ready to start");
     });
 
     startNextCalibrationStep();
diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
index f4b3a68..a8d7168 100644
--- a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
@@ -168,7 +168,11 @@ VNA::VNA(AppWindow *window, QString name)
 
     // A modal QProgressDialog calls processEvents() in setValue(). Needs to use a queued connection to update the progress
     // value from within the NewDatapoint slot to prevent possible re-entrancy.
-    connect(this, &VNA::calibrationMeasurementPercentage, calDialog, &QProgressDialog::setValue, Qt::QueuedConnection);
+    connect(this, &VNA::calibrationMeasurementPercentage, calDialog, [=](int percent) {
+        if(calMeasuring || percent == 100) {
+            calDialog->setValue(percent);
+        }
+    }, Qt::QueuedConnection);
 
     connect(calDialog, &QProgressDialog::canceled, this, [=]() {
         // the user aborted the calibration measurement