diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index 269e2c02..a2980c82 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -167,14 +167,8 @@ namespace MapControl
 
                     if (GetAutoCollapse(element))
                     {
-                        if (position.HasValue && IsOutsideViewport(position.Value))
-                        {
-                            element.Visibility = Visibility.Collapsed;
-                        }
-                        else
-                        {
-                            element.ClearValue(VisibilityProperty);
-                        }
+                        element.Visibility = position.HasValue && IsOutsideViewport(position.Value)
+                            ? Visibility.Collapsed : Visibility.Visible;
                     }
 
                     if (position.HasValue)