diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
index f19e7dd52..4eb963699 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
+++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
@@ -65,6 +65,7 @@ SDRdaemonGui::SDRdaemonGui(PluginAPI* pluginAPI, QWidget* parent) :
 	DSPEngine::instance()->setSource(m_sampleSource);
 
 	displaySettings();
+	ui->applyButton->setEnabled(false);
 }
 
 SDRdaemonGui::~SDRdaemonGui()
@@ -264,6 +265,18 @@ void SDRdaemonGui::on_applyButton_clicked(bool checked)
 	m_port = udpPort;
 
 	configureUDPLink();
+
+	ui->applyButton->setEnabled(false);
+}
+
+void SDRdaemonGui::on_address_textEdited(const QString& arg1)
+{
+	ui->applyButton->setEnabled(true);
+}
+
+void SDRdaemonGui::on_port_textEdited(const QString& arg1)
+{
+	ui->applyButton->setEnabled(true);
 }
 
 void SDRdaemonGui::on_dcOffset_toggled(bool checked)
diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.h b/plugins/samplesource/sdrdaemon/sdrdaemongui.h
index baac02844..9e3a2ac7d 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemongui.h
+++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.h
@@ -87,6 +87,8 @@ private slots:
 	void on_applyButton_clicked(bool checked);
 	void on_dcOffset_toggled(bool checked);
 	void on_iqImbalance_toggled(bool checked);
+	void on_address_textEdited(const QString& arg1);
+	void on_port_textEdited(const QString& arg1);
 	void tick();
 };