diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index e95366bcf..867c1f4f1 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -594,8 +594,9 @@ void MainWindow::on_action_Preferences_triggered()
 void MainWindow::on_sampleSource_currentIndexChanged(int index)
 {
 	m_pluginManager->saveSourceSettings(m_settings.getWorkingPreset());
-	m_pluginManager->selectSampleSourceByIndex(ui->sampleSource->currentIndex());
+	//m_pluginManager->selectSampleSourceByIndex(ui->sampleSource->currentIndex());
 	//m_settings.setSourceIndex(ui->sampleSource->currentIndex());
+	m_pluginManager->selectSampleSourceByIndex(m_deviceUIs.back()->m_sampleSource->currentIndex());
 	m_settings.setSourceIndex(m_deviceUIs.back()->m_sampleSource->currentIndex());
 	m_pluginManager->loadSourceSettings(m_settings.getWorkingPreset());
 }
diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui
index 0e413924e..f60b104a6 100644
--- a/sdrbase/mainwindow.ui
+++ b/sdrbase/mainwindow.ui
@@ -375,29 +375,8 @@
         </font>
        </property>
        <property name="currentIndex">
-        <number>0</number>
+        <number>-1</number>
        </property>
-       <widget class="QWidget" name="rxTabInput">
-        <attribute name="title">
-         <string>Rx</string>
-        </attribute>
-        <widget class="QComboBox" name="sampleSource">
-         <property name="geometry">
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>255</width>
-           <height>24</height>
-          </rect>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>255</width>
-           <height>0</height>
-          </size>
-         </property>
-        </widget>
-       </widget>
       </widget>
      </item>
     </layout>