diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/StartAnalysisRaceMap.gss b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/StartAnalysisRaceMap.gss
index 7e6c510cdf9..559a069dba2 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/StartAnalysisRaceMap.gss
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/StartAnalysisRaceMap.gss
@@ -38,7 +38,7 @@
 }
 
 .estimatedDuration {
-    margin-top:70px;
+    margin-top:10px;
     font-size: 19px;
     color:black;
     background-color:rgba(255,255,255,0.75);
@@ -49,4 +49,8 @@
     padding-right: 8px;
     padding-left: 8px;
     margin-bottom: 10px;
+}
+
+.estimatedDurationWithHeader {
+    margin-top:70px;
 }
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.css
index 3941225b839..1bde0b01fe7 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.css
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.css
@@ -37,7 +37,7 @@ body {
 }
 
 .estimatedDuration {
-	margin-top:70px;
+    margin-top:10px;
     font-size: 19px;
     color:black;
     background-color:rgba(255,255,255,0.75);
@@ -48,4 +48,8 @@ body {
     padding-right: 8px;
     padding-left: 8px;
     margin-bottom: 10px;
+}
+
+.estimatedDurationWithHeader {
+    margin-top:70px;
 }
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
index b8343a9f74f..b539ed25144 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
@@ -420,6 +420,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
     private CompetitorDTO advantageLineCompetitor;
     protected Label estimatedDurationOverlay;
     private RaceMapStyle raceMapStyle;
+    private final boolean showHeaderPanel;
 
     private class AdvantageLineUpdater implements QuickRanksListener {
         @Override
@@ -439,6 +440,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
             StringMessages stringMessages, RegattaAndRaceIdentifier raceIdentifier, 
             RaceMapResources raceMapResources, boolean showHeaderPanel, QuickRanksDTOProvider quickRanksDTOProvider) {
         super(parent, context);
+        this.showHeaderPanel = showHeaderPanel;
         this.quickRanksDTOProvider = quickRanksDTOProvider;
         this.raceMapLifecycle = raceMapLifecycle;
         this.stringMessages = stringMessages;
@@ -446,7 +448,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
         this.raceIdentifier = raceIdentifier;
         this.asyncActionsExecutor = asyncActionsExecutor;
         this.errorReporter = errorReporter;
-       this.timer = timer;
+        this.timer = timer;
         this.isSimulationEnabled = true;
         timer.addTimeListener(this);
         raceMapImageManager = new RaceMapImageManager(raceMapResources);
@@ -1064,6 +1066,9 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
         if (estimatedDurationOverlay == null) {
             estimatedDurationOverlay = new Label("");
             estimatedDurationOverlay.setStyleName(raceMapStyle.estimatedDuration());
+            if(showHeaderPanel) {
+                estimatedDurationOverlay.addStyleName(raceMapStyle.estimatedDurationWithHeader());
+            }
             map.setControls(ControlPosition.TOP_CENTER, estimatedDurationOverlay);
         }
         estimatedDurationOverlay.setText(stringMessages.estimatedDuration()
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapStyle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapStyle.java
index 22b9d8d7110..9db70841b5c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapStyle.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapStyle.java
@@ -19,4 +19,5 @@ public interface RaceMapStyle extends CssResource {
     public String combinedWindPanel();
     public String trueNorthIndicatorPanel();
     public String estimatedDuration();
+    public String estimatedDurationWithHeader();
 }