diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMap.java
index 07eeb8b700a..877eb194688 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMap.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMap.java
@@ -499,9 +499,11 @@ public class RaceMap extends SimplePanel implements TimeListener, CompetitorSele
     
     private void zoomMapToNewBounds(LatLngBounds newBounds) {
         if (newBounds != null) {
+            boolean oldMapZoomedOrPannedSinceLastRaceSelectionChange = mapZoomedOrPannedSinceLastRaceSelectionChange;
             map.setZoomLevel(map.getBoundsZoomLevel(newBounds));
             map.setCenter(newBounds.getCenter());
             map.checkResizeAndCenter();
+            mapZoomedOrPannedSinceLastRaceSelectionChange = oldMapZoomedOrPannedSinceLastRaceSelectionChange;
         }
     }