diff --git a/MapControl/Shared/MapBase.cs b/MapControl/Shared/MapBase.cs
index 5e8215e5..568965a3 100644
--- a/MapControl/Shared/MapBase.cs
+++ b/MapControl/Shared/MapBase.cs
@@ -213,12 +213,12 @@ namespace MapControl
         {
             var point = MapProjection.LocationToMap(location);
 
-            if (!point.HasValue)
+            if (point.HasValue)
             {
-                return null;
+                point = ViewTransform.MapToView(point.Value);
             }
 
-            return ViewTransform.MapToView(point.Value);
+            return point;
         }
 
         /// <summary>
diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index 9b64ff8c..5c4767cf 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -191,8 +191,7 @@ namespace MapControl
         {
             var position = parentMap.LocationToView(location);
 
-            if (parentMap.MapProjection.Type <= MapProjectionType.NormalCylindrical &&
-                IsOutsideViewport(position))
+            if (IsOutsideViewport(position) && parentMap.MapProjection.Type <= MapProjectionType.NormalCylindrical)
             {
                 position = parentMap.LocationToView(
                     new Location(location.Latitude, parentMap.CoerceLongitude(location.Longitude)));
@@ -219,8 +218,7 @@ namespace MapControl
             var position = parentMap.ViewTransform.MapToView(rectCenter);
             var projection = parentMap.MapProjection;
 
-            if (projection.Type <= MapProjectionType.NormalCylindrical &&
-                IsOutsideViewport(position))
+            if (IsOutsideViewport(position) && projection.Type <= MapProjectionType.NormalCylindrical)
             {
                 var location = projection.MapToLocation(rectCenter);
 
@@ -258,21 +256,24 @@ namespace MapControl
         private void ArrangeChildElement(FrameworkElement element, Size panelSize)
         {
             var location = GetLocation(element);
-            var position = location != null ? GetViewPosition(location) : null;
 
-            SetViewPosition(element, ref position);
-
-            if (GetAutoCollapse(element))
+            if (location != null)
             {
-                SetVisible(element, !IsOutsideViewport(position));
-            }
+                var position = GetViewPosition(location);
+
+                SetViewPosition(element, ref position);
+
+                if (GetAutoCollapse(element))
+                {
+                    SetVisible(element, !IsOutsideViewport(position));
+                }
 
-            if (position.HasValue)
-            {
                 ArrangeElement(element, position.Value);
             }
             else
             {
+                element.ClearValue(ViewPositionProperty);
+
                 var boundingBox = GetBoundingBox(element);
 
                 if (boundingBox != null)
@@ -394,19 +395,17 @@ namespace MapControl
 
         internal static Size GetDesiredSize(FrameworkElement element)
         {
-            var width = 0d;
-            var height = 0d;
+            var width = element.DesiredSize.Width;
+            var height = element.DesiredSize.Height;
 
-            if (element.DesiredSize.Width >= 0d &&
-                element.DesiredSize.Width < double.PositiveInfinity)
+            if (width < 0d || width == double.PositiveInfinity)
             {
-                width = element.DesiredSize.Width;
+                width = 0d;
             }
 
-            if (element.DesiredSize.Height >= 0d &&
-                element.DesiredSize.Height < double.PositiveInfinity)
+            if (height < 0d || height == double.PositiveInfinity)
             {
-                height = element.DesiredSize.Height;
+                height = 0d;
             }
 
             return new Size(width, height);