diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp
index 93e35b870..9575b8a04 100644
--- a/src/blackgui/components/settingssimulatorcomponent.cpp
+++ b/src/blackgui/components/settingssimulatorcomponent.cpp
@@ -154,14 +154,14 @@ namespace BlackGui
             if (enabled && !e.contains(selected->getIdentifier()))
             {
                 e << selected->getIdentifier();
+                m_enabledSimulators.set(e);
             }
             else if (!enabled)
             {
                 e.removeAll(selected->getIdentifier());
+                m_enabledSimulators.set(e);
             }
 
-            m_enabledSimulators.set(e);
-
             // changing of GUI state will be done via received signal
         }