diff --git a/src/blackgui/simulatorselector.cpp b/src/blackgui/simulatorselector.cpp
index 010052eb4..0620dddd5 100644
--- a/src/blackgui/simulatorselector.cpp
+++ b/src/blackgui/simulatorselector.cpp
@@ -20,6 +20,16 @@ namespace BlackGui
     {
         ui->setupUi(this);
         this->setMode(CheckBoxes);
+
+        connect(this->ui->rb_FS9, &QRadioButton::clicked, this, &CSimulatorSelector::ps_RadioButtonChanged);
+        connect(this->ui->rb_FSX, &QRadioButton::clicked, this, &CSimulatorSelector::ps_RadioButtonChanged);
+        connect(this->ui->rb_P3D, &QRadioButton::clicked, this, &CSimulatorSelector::ps_RadioButtonChanged);
+        connect(this->ui->rb_XPlane, &QRadioButton::clicked, this, &CSimulatorSelector::ps_RadioButtonChanged);
+
+        connect(this->ui->cb_FS9, &QRadioButton::clicked, this, &CSimulatorSelector::ps_CheckBoxChanged);
+        connect(this->ui->cb_FSX, &QRadioButton::clicked, this, &CSimulatorSelector::ps_CheckBoxChanged);
+        connect(this->ui->cb_P3D, &QRadioButton::clicked, this, &CSimulatorSelector::ps_CheckBoxChanged);
+        connect(this->ui->cb_XPlane, &QRadioButton::clicked, this, &CSimulatorSelector::ps_CheckBoxChanged);
     }
 
     CSimulatorSelector::~CSimulatorSelector()
@@ -44,6 +54,11 @@ namespace BlackGui
 
     CSimulatorInfo CSimulatorSelector::getValue() const
     {
+        if (this->m_noSelectionMeansAll && this->isUnselected())
+        {
+            return CSimulatorInfo::allSimulators();
+        }
+
         switch (this->m_mode)
         {
         default:
@@ -71,11 +86,63 @@ namespace BlackGui
 
     void CSimulatorSelector::setAll()
     {
+        // checkboxes
         this->ui->cb_FSX->setChecked(true);
         this->ui->cb_FS9->setChecked(true);
         this->ui->cb_XPlane->setChecked(true);
         this->ui->cb_P3D->setChecked(true);
 
-        this->ui->cb_FSX->setChecked(true);
+        // radio
+        this->ui->rb_FSX->setChecked(true);
     }
-}
+
+    bool CSimulatorSelector::isUnselected() const
+    {
+        bool c = false;
+        switch (this->m_mode)
+        {
+        default:
+        case CheckBoxes:
+            c = this->ui->cb_FSX->isChecked() || this->ui->cb_FS9->isChecked() ||
+                this->ui->cb_XPlane->isChecked() || this->ui->cb_P3D->isChecked();
+            break;
+        case RadioButtons:
+            c = this->ui->rb_FSX->isChecked() || this->ui->rb_FS9->isChecked() ||
+                this->ui->rb_XPlane->isChecked() || this->ui->cb_P3D->isChecked();
+            break;
+        }
+        return !c;
+    }
+
+    bool CSimulatorSelector::areAllSelected() const
+    {
+        bool c = false;
+        switch (this->m_mode)
+        {
+        default:
+        case CheckBoxes:
+            c = this->ui->cb_FSX->isChecked() && this->ui->cb_FS9->isChecked() &&
+                this->ui->cb_XPlane->isChecked() && this->ui->cb_P3D->isChecked();
+            break;
+        case RadioButtons:
+            // actually this should never be true
+            c = false;
+            break;
+        }
+        return c;
+    }
+
+    void CSimulatorSelector::ps_RadioButtonChanged(bool checked)
+    {
+        if (this->m_mode != RadioButtons) { return; }
+        if (!checked) { return; } // only the checked ones are relevant, as the unchecked ones are accompanied with checked events
+        emit this->changed(this->getValue());
+    }
+
+    void CSimulatorSelector::ps_CheckBoxChanged(bool checked)
+    {
+        if (this->m_mode != CheckBoxes) { return; }
+        Q_UNUSED(checked);
+        emit this->changed(this->getValue());
+    }
+} // ns
diff --git a/src/blackgui/simulatorselector.h b/src/blackgui/simulatorselector.h
index dd3c544a1..572fa254d 100644
--- a/src/blackgui/simulatorselector.h
+++ b/src/blackgui/simulatorselector.h
@@ -42,6 +42,9 @@ namespace BlackGui
         //! How to display
         void setMode(Mode mode);
 
+        //! No selection treated same as all selected (filters)
+        void setNoSelectionMeansAll(bool v) { this->m_noSelectionMeansAll = v; }
+
         //! Get the value
         BlackMisc::Simulation::CSimulatorInfo getValue() const;
 
@@ -51,9 +54,27 @@ namespace BlackGui
         //! Set all, only making sense with checkboxes
         void setAll();
 
+        //! Not selected at all
+        bool isUnselected() const;
+
+        //! All selected
+        bool areAllSelected() const;
+
+    signals:
+        //! Value has been changed
+        void changed(const BlackMisc::Simulation::CSimulatorInfo &info);
+
+    private slots:
+        //! Radio button changed
+        void ps_RadioButtonChanged(bool checked);
+
+        //! Checkbox changed
+        void ps_CheckBoxChanged(bool checked);
+
     private:
         QScopedPointer<Ui::CSimulatorSelector> ui;
         Mode m_mode = CheckBoxes;
+        bool m_noSelectionMeansAll = false; //!< for filters, no selection means all
     };
 }