diff --git a/misc_modules/rigctl_server/src/main.cpp b/misc_modules/rigctl_server/src/main.cpp
index 4740f2df..8495c3dc 100644
--- a/misc_modules/rigctl_server/src/main.cpp
+++ b/misc_modules/rigctl_server/src/main.cpp
@@ -131,11 +131,11 @@ private:
             std::lock_guard lck(_this->vfoMtx);
             if (ImGui::Combo(CONCAT("##_rigctl_srv_vfo_", _this->name), &_this->vfoId, _this->vfoNamesTxt.c_str())) {
                 _this->selectVfoByName(_this->vfoNames[_this->vfoId], false);
-            }
-            if (!_this->selectedVfo.empty()) {
-                config.acquire();
-                config.conf[_this->name]["vfo"] = _this->selectedVfo;
-                config.release(true);
+                if (!_this->selectedVfo.empty()) {
+                    config.acquire();
+                    config.conf[_this->name]["vfo"] = _this->selectedVfo;
+                    config.release(true);
+                }
             }
         }
 
diff --git a/source_modules/rtl_sdr_source/src/main.cpp b/source_modules/rtl_sdr_source/src/main.cpp
index 11802e7f..02ffe062 100644
--- a/source_modules/rtl_sdr_source/src/main.cpp
+++ b/source_modules/rtl_sdr_source/src/main.cpp
@@ -427,9 +427,10 @@ private:
         }
 
         if (_this->tunerAgc || _this->gainList.size() == 0) { SmGui::BeginDisabled(); }
+
+        SmGui::LeftLabel("Gain");
         SmGui::FillWidth();
         SmGui::ForceSync();
-
         // TODO: FIND ANOTHER WAY
         if (_this->serverMode) {
             if (SmGui::SliderInt(CONCAT("##_rtlsdr_gain_", _this->name), &_this->gainId, 0, _this->gainList.size() - 1, SmGui::FMT_STR_NONE)) {
diff --git a/source_modules/rtl_tcp_source/src/main.cpp b/source_modules/rtl_tcp_source/src/main.cpp
index 5e898667..feddb1c8 100644
--- a/source_modules/rtl_tcp_source/src/main.cpp
+++ b/source_modules/rtl_tcp_source/src/main.cpp
@@ -239,6 +239,7 @@ private:
         }
 
         if (_this->tunerAGC) { SmGui::BeginDisabled(); }
+        SmGui::LeftLabel("Gain");
         SmGui::FillWidth();
         if (SmGui::SliderInt(CONCAT("##_gain_select_", _this->name), &_this->gain, 0, 28, SmGui::FMT_STR_NONE)) {
             if (_this->running) {