diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp
index ac308fa22..aceead916 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.cpp
+++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp
@@ -241,7 +241,38 @@ void SDRPlayGui::displaySettings()
     ui->decim->setCurrentIndex(m_settings.m_log2Decim);
     ui->fcPos->setCurrentIndex((int) m_settings.m_fcPos);
 
-    ui->gainTunerOn->setChecked(true);
+    ui->gainTunerOn->setChecked(m_settings.m_tunerGainMode);
+
+    if (m_settings.m_tunerGainMode)
+    {
+        ui->gainTuner->setEnabled(true);
+        ui->gainLNA->setEnabled(false);
+        ui->gainMixer->setEnabled(false);
+        ui->gainBaseband->setEnabled(false);
+
+        int gain = m_settings.m_tunerGain;
+        ui->gainTuner->setValue(gain);
+        QString gainText;
+        gainText.sprintf("%03d", gain);
+        ui->gainTunerText->setText(gainText);
+        m_settings.m_tunerGain = gain;
+    }
+    else
+    {
+        ui->gainTuner->setEnabled(false);
+        ui->gainLNA->setEnabled(true);
+        ui->gainMixer->setEnabled(true);
+        ui->gainBaseband->setEnabled(true);
+
+        ui->gainLNA->setChecked(m_settings.m_lnaOn != 0);
+        ui->gainMixer->setChecked(m_settings.m_mixerAmpOn != 0);
+
+        int gain = m_settings.m_basebandGain;
+        ui->gainBaseband->setValue(gain);
+        QString gainText;
+        gainText.sprintf("%02d", gain);
+        ui->gainBasebandText->setText(gainText);
+    }
 }
 
 void SDRPlayGui::sendSettings()
diff --git a/plugins/samplesource/sdrplay/sdrplaygui.ui b/plugins/samplesource/sdrplay/sdrplaygui.ui
index 8b87bb805..65f9740f5 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.ui
+++ b/plugins/samplesource/sdrplay/sdrplaygui.ui
@@ -540,8 +540,11 @@
      </item>
      <item row="0" column="7">
       <widget class="ButtonSwitch" name="gainLNA">
+       <property name="acceptDrops">
+        <bool>true</bool>
+       </property>
        <property name="toolTip">
-        <string>LNA toggle</string>
+        <string>LNA toggle (gain depends on frequency)</string>
        </property>
        <property name="text">
         <string>LNA</string>
@@ -587,7 +590,7 @@
      <item row="0" column="8">
       <widget class="ButtonSwitch" name="gainMixer">
        <property name="toolTip">
-        <string>Mixer amplifier toggle</string>
+        <string>Mixer amplifier toggle (+19 dB)</string>
        </property>
        <property name="text">
         <string>MIX</string>