diff --git a/Software/PC_Application/Calibration/calibration.cpp b/Software/PC_Application/Calibration/calibration.cpp
index 54f02c9..655f7ad 100644
--- a/Software/PC_Application/Calibration/calibration.cpp
+++ b/Software/PC_Application/Calibration/calibration.cpp
@@ -709,6 +709,7 @@ bool Calibration::openFromFile(QString filename)
         qWarning() << "Calibration file parsing failed: " << e.what();
         return false;
     }
+    this->currentCalFile = filename;    // if all ok, remember this and show on widget
 
     return true;
 }
@@ -741,6 +742,7 @@ bool Calibration::saveToFile(QString filename)
     auto calkit_file = filename + ".calkit";
     qDebug() << "Saving associated calibration kit to file" << calkit_file;
     kit.toFile(calkit_file);
+    this->currentCalFile = calibration_file;        // if all ok, remember this and show on widget
 
     return true;
 }
@@ -770,6 +772,10 @@ QString Calibration::hzToString(double freqHz){
     return res;
 }
 
+QString Calibration::getCurrentCalibrationFile(){
+    return this->currentCalFile;
+}
+
 ostream& operator<<(ostream &os, const Calibration &c)
 {
     for(auto m : c.measurements) {
diff --git a/Software/PC_Application/Calibration/calibration.h b/Software/PC_Application/Calibration/calibration.h
index 76e40b7..4e700ff 100644
--- a/Software/PC_Application/Calibration/calibration.h
+++ b/Software/PC_Application/Calibration/calibration.h
@@ -138,6 +138,11 @@ private:
 
     Calkit kit;
     QString hzToString(double freqHz);
+
+private:
+    QString currentCalFile;
+public:
+    QString getCurrentCalibrationFile();
 };
 
 #endif // CALIBRATION_H
diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp
index 08d7fb2..c4cb26a 100644
--- a/Software/PC_Application/VNA/vna.cpp
+++ b/Software/PC_Application/VNA/vna.cpp
@@ -287,7 +287,7 @@ VNA::VNA(AppWindow *window)
 
     // Calibration toolbar (and populate calibration menu)
     auto tb_cal = new QToolBar("Calibration");
-    auto cbEnableCal_label = new QLabel("Calibration:");
+    QLabel *cbEnableCal_label = new QLabel("Calibration:");
     tb_cal->addWidget(cbEnableCal_label);
     auto cbEnableCal = new QCheckBox;
     tb_cal->addWidget(cbEnableCal);
@@ -328,6 +328,7 @@ VNA::VNA(AppWindow *window)
         calDisable->setChecked(true);
         cbEnableCal->setCheckState(Qt::CheckState::Unchecked);
         cbEnableCal_label->setStyleSheet("background-color: yellow");
+        cbEnableCal_label->setToolTip("none");
         cbType->blockSignals(false);
         cbEnableCal->blockSignals(false);
         calImportTerms->setEnabled(false);
@@ -346,6 +347,7 @@ VNA::VNA(AppWindow *window)
         }
         cbEnableCal->setCheckState(Qt::CheckState::Checked);
         cbEnableCal_label->setStyleSheet("");
+        cbEnableCal_label->setToolTip(cal.getCurrentCalibrationFile());
         cbType->blockSignals(false);
         cbEnableCal->blockSignals(false);
         calImportTerms->setEnabled(true);