diff --git a/plugins/samplesource/gnuradio/gnuradiogui.cpp b/plugins/samplesource/gnuradio/gnuradiogui.cpp
index 80e0b25..3291aa4 100644
--- a/plugins/samplesource/gnuradio/gnuradiogui.cpp
+++ b/plugins/samplesource/gnuradio/gnuradiogui.cpp
@@ -391,7 +391,6 @@ void GNURadioGui::on_cboSampleRate_currentIndexChanged(int index)
 		return;
 
 	m_settings.m_sampRate = m_sampRates[index];
-
 	sendSettings();
 }
 
diff --git a/plugins/samplesource/gnuradio/gnuradioinput.cpp b/plugins/samplesource/gnuradio/gnuradioinput.cpp
index 9fb627c..b564822 100644
--- a/plugins/samplesource/gnuradio/gnuradioinput.cpp
+++ b/plugins/samplesource/gnuradio/gnuradioinput.cpp
@@ -315,8 +315,11 @@ bool GNURadioInput::applySettings(const GeneralSettings& generalSettings,
 			}
 		}
 
-		if((m_settings.m_bandwidth != settings.m_bandwidth) || force) {
+		if((m_settings.m_bandwidth != settings.m_bandwidth) ||
+				(0.0f == settings.m_bandwidth) || force) {
 			m_settings.m_bandwidth = settings.m_bandwidth;
+			/* setting the BW to 0.0 triggers automatic bandwidth
+			 * selection when supported by device */
 			radio->set_bandwidth( m_settings.m_bandwidth );
 		}