diff --git a/src/blackgui/transpondermodeselector.cpp b/src/blackgui/transpondermodeselector.cpp
index e1b2760bf..4620e22ab 100644
--- a/src/blackgui/transpondermodeselector.cpp
+++ b/src/blackgui/transpondermodeselector.cpp
@@ -65,16 +65,19 @@ namespace BlackGui
         {
             this->m_resetTimer.stop();
         }
+        emit this->valueChanged();
     }
 
     void CTransponderModeSelector::setSelectedTransponderModeAsString(const QString &mode)
     {
-        this->setSelectedTransponderMode(CTransponder::modeFromString(mode));
+        CTransponder::TransponderMode m = CTransponder::modeFromString(mode);
+        if (this->m_currentMode == m) return; // nothing to change
+        this->setSelectedTransponderMode(m);
     }
 
     void CTransponderModeSelector::resetTransponderMode()
     {
-        if (!this->isIdentSelected()) return;
+        if (!this->isIdentSelected()) return; // avoid unnecessary events
         this->setSelectedTransponderMode(this->m_resetMode);
     }
 }
diff --git a/src/blackgui/transpondermodeselector.h b/src/blackgui/transpondermodeselector.h
index b61ecb296..b820bd826 100644
--- a/src/blackgui/transpondermodeselector.h
+++ b/src/blackgui/transpondermodeselector.h
@@ -65,8 +65,12 @@ namespace BlackGui
         void setSelectedTransponderModeAsString(const QString &mode);
 
     signals:
+        //! Singal, which makes sure the value is already updated internally
+        void valueChanged();
+
         //! \brief Ident ended
         void identEnded();
+
     };
 } // namespace