diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
index ca7d7558a..d92fe779d 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
@@ -257,6 +257,9 @@ void LimeSDROutputGUI::updateDACRate()
 
 void LimeSDROutputGUI::displaySettings()
 {
+    ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq);
+    ui->extClock->setExternalClockActive(m_settings.m_extClock);
+
     ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
     ui->sampleRate->setValue(m_settings.m_devSampleRate);
 
@@ -470,3 +473,12 @@ void LimeSDROutputGUI::on_antenna_currentIndexChanged(int index)
     m_settings.m_antennaPath = (LimeSDROutputSettings::PathRFE) index;
     sendSettings();
 }
+
+void LimeSDROutputGUI::on_extClock_clicked()
+{
+    m_settings.m_extClock = ui->extClock->getExternalClockActive();
+    m_settings.m_extClockFreq = ui->extClock->getExternalClockFrequency();
+    qDebug("LimeSDROutputGUI::on_extClock_clicked: %u Hz %s", m_settings.m_extClockFreq, m_settings.m_extClock ? "on" : "off");
+    sendSettings();
+}
+
diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.h b/plugins/samplesink/limesdroutput/limesdroutputgui.h
index bbe3e6533..301722131 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputgui.h
+++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h
@@ -90,6 +90,7 @@ private slots:
     void on_lpFIR_changed(quint64 value);
     void on_gain_valueChanged(int value);
     void on_antenna_currentIndexChanged(int index);
+    void on_extClock_clicked();
 
     void updateHardware();
     void updateStatus();
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
index c5ee62509..9ab1268bf 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
@@ -254,6 +254,9 @@ void LimeSDRInputGUI::updateSampleRateAndFrequency()
 
 void LimeSDRInputGUI::displaySettings()
 {
+    ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq);
+    ui->extClock->setExternalClockActive(m_settings.m_extClock);
+
     ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
     ui->sampleRate->setValue(m_settings.m_devSampleRate);
 
@@ -556,3 +559,12 @@ void LimeSDRInputGUI::on_antenna_currentIndexChanged(int index)
     m_settings.m_antennaPath = (LimeSDRInputSettings::PathRFE) index;
     sendSettings();
 }
+
+void LimeSDRInputGUI::on_extClock_clicked()
+{
+    m_settings.m_extClock = ui->extClock->getExternalClockActive();
+    m_settings.m_extClockFreq = ui->extClock->getExternalClockFrequency();
+    qDebug("LimeSDRInputGUI::on_extClock_clicked: %u Hz %s", m_settings.m_extClockFreq, m_settings.m_extClock ? "on" : "off");
+    sendSettings();
+}
+
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.h b/plugins/samplesource/limesdrinput/limesdrinputgui.h
index ed73d3994..2bc328dfe 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputgui.h
+++ b/plugins/samplesource/limesdrinput/limesdrinputgui.h
@@ -96,6 +96,7 @@ private slots:
     void on_tiaGain_currentIndexChanged(int index);
     void on_pgaGain_valueChanged(int value);
     void on_antenna_currentIndexChanged(int index);
+    void on_extClock_clicked();
 
     void updateHardware();
     void updateStatus();
diff --git a/sdrgui/gui/externalclockbutton.cpp b/sdrgui/gui/externalclockbutton.cpp
index f57ab0b40..a4bddab22 100644
--- a/sdrgui/gui/externalclockbutton.cpp
+++ b/sdrgui/gui/externalclockbutton.cpp
@@ -24,7 +24,7 @@
 ExternalClockButton::ExternalClockButton(QWidget* parent) :
     QPushButton(parent),
     m_externalClockFrequency(0),
-    m_externalClockFrequencyActive(false)
+    m_externalClockActive(false)
 {
     setObjectName("ExternalClockButton");
     connect(this, SIGNAL(clicked()), this, SLOT(onClicked()));
@@ -32,7 +32,7 @@ ExternalClockButton::ExternalClockButton(QWidget* parent) :
 
 void ExternalClockButton::onClicked()
 {
-    ExternalClockDialog externalClockDialog(m_externalClockFrequency, m_externalClockFrequencyActive, this);
+    ExternalClockDialog externalClockDialog(m_externalClockFrequency, m_externalClockActive, this);
     externalClockDialog.exec();
     updateState();
 }
@@ -41,9 +41,9 @@ void ExternalClockButton::updateState()
 {
     setToolTip(tr("External clock dialog. External clock frequency %1 MHz %2")
             .arg(m_externalClockFrequency/1000000.0)
-            .arg(m_externalClockFrequencyActive ? "enabled" : "disabled"));
+            .arg(m_externalClockActive ? "enabled" : "disabled"));
 
-    if(m_externalClockFrequencyActive)
+    if(m_externalClockActive)
     {
         setStyleSheet("ExternalClockButton { background:rgb(128, 70, 0); }");
     }
diff --git a/sdrgui/gui/externalclockbutton.h b/sdrgui/gui/externalclockbutton.h
index d83714749..b18d1bc40 100644
--- a/sdrgui/gui/externalclockbutton.h
+++ b/sdrgui/gui/externalclockbutton.h
@@ -29,7 +29,7 @@ class ExternalClockButton : public QPushButton {
 public:
     ExternalClockButton(QWidget* parent = 0);
     qint64 getExternalClockFrequency() const { return m_externalClockFrequency; }
-    bool getExternalClockFrequencyActive() const { return m_externalClockFrequencyActive; }
+    bool getExternalClockActive() const { return m_externalClockActive; }
 
     void setExternalClockFrequency(qint64 deltaFrequency)
     {
@@ -37,9 +37,9 @@ public:
         updateState();
     }
 
-    void setExternalcClockFrequencyActive(bool active)
+    void setExternalClockActive(bool active)
     {
-        m_externalClockFrequencyActive = active;
+        m_externalClockActive = active;
         updateState();
     }
 
@@ -48,7 +48,7 @@ private slots:
 
 private:
     qint64 m_externalClockFrequency;
-    bool m_externalClockFrequencyActive;
+    bool m_externalClockActive;
 
     void updateState();
 };