diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java
index 624a8ad17ee..c3e559887ec 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java
@@ -98,6 +98,7 @@ public class RaceMapSettingsDialogComponent implements SettingsDialogComponent<R
         
         if (isSimulationEnabled) {
             showSimulationOverlayCheckbox = dialog.createCheckbox(stringMessages.showSimulationOverlay());
+            showSimulationOverlayCheckbox.ensureDebugId("showSimulatorOverlay");
             showSimulationOverlayCheckbox.setValue(initialSettings.isShowSimulationOverlay());
             vp.add(showSimulationOverlayCheckbox);
         }
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/raceboard/MapSettingsPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/raceboard/MapSettingsPO.java
index 536be244a99..2e21580c20f 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/raceboard/MapSettingsPO.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/raceboard/MapSettingsPO.java
@@ -16,6 +16,9 @@ public class MapSettingsPO extends PageArea {
 
     @FindBy(how = BySeleniumId.class, using = "SaveButton")
     private WebElement saveButton;
+    
+    @FindBy(how = BySeleniumId.class, using = "showSimulatorOverlay-input")
+    private WebElement showSimulatorOverlay;
 
     public MapSettingsPO(WebDriver driver, WebElement element) {
         super(driver, element);
@@ -54,4 +57,8 @@ public class MapSettingsPO extends PageArea {
     public boolean isWindChartSelected() {
         return raceMapSettingsWindChart.isSelected();
     }
+    
+    public boolean isSimulatorOverlayAvailable() {
+        return (showSimulatorOverlay != null);
+    }
 }