diff --git a/MapControl/Shared/MapBase.cs b/MapControl/Shared/MapBase.cs
index 20d0c317..8aa67f39 100644
--- a/MapControl/Shared/MapBase.cs
+++ b/MapControl/Shared/MapBase.cs
@@ -313,6 +313,8 @@ namespace MapControl
 
         internal double NearestLongitude(double longitude)
         {
+            longitude = Location.NormalizeLongitude(longitude);
+            
             var offset = longitude - Center.Longitude;
 
             if (offset > 180d)
diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index 8aca1be3..905ac450 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -224,7 +224,7 @@ namespace MapControl
             {
                 var longitude = parentMap.NearestLongitude(location.Longitude);
 
-                if (longitude != location.Longitude)
+                if (!location.LongitudeEquals(longitude))
                 {
                     position = parentMap.LocationToView(location.Latitude, longitude);
                 }
@@ -243,7 +243,7 @@ namespace MapControl
                 var location = parentMap.MapProjection.MapToLocation(center);
                 var longitude = parentMap.NearestLongitude(location.Longitude);
 
-                if (longitude != location.Longitude)
+                if (!location.LongitudeEquals(longitude))
                 {
                     position = parentMap.LocationToView(location.Latitude, longitude);
                 }