diff --git a/repeatersetup.cpp b/repeatersetup.cpp
index 155cc79..b7412e2 100644
--- a/repeatersetup.cpp
+++ b/repeatersetup.cpp
@@ -398,8 +398,14 @@ void repeaterSetup::handleUpdateCurrentMainMode(mode_info m)
 
 void repeaterSetup::handleRptOffsetFrequency(freqt f)
 {
+    // Called when a new offset is available from the radio.
     QString offsetstr = QString::number(f.Hz / double(1E6), 'f', 4);
-    ui->rptrOffsetEdit->setText(offsetstr);
+
+    if(!ui->rptrOffsetEdit->hasFocus())
+    {
+        ui->rptrOffsetEdit->setText(offsetstr);
+        currentOffset = f;
+    }
 }
 
 void repeaterSetup::handleTransmitStatus(bool amTransmitting)
@@ -805,6 +811,7 @@ void repeaterSetup::on_rptrOffsetSetBtn_clicked()
     {
         emit setRptDuplexOffset(f);
     }
+    ui->rptrOffsetEdit->clearFocus();
 }
 
 void repeaterSetup::on_rptrOffsetEdit_returnPressed()
diff --git a/repeatersetup.h b/repeatersetup.h
index 47f3ec1..6ad367e 100644
--- a/repeatersetup.h
+++ b/repeatersetup.h
@@ -121,6 +121,7 @@ private:
     duplexMode currentdm;
     mode_info currentModeMain;
     mode_info modeTransmitVFO;
+    freqt currentOffset;
     bool usedPlusSplit = false;
     bool amTransmitting = false;
 };