Index: Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs
===================================================================
diff -u -r944d8f057924d6aa559f248328b07bf5d8607a7b -r38628d40c8fe8a67f2186bce447026397907e9eb
--- Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 944d8f057924d6aa559f248328b07bf5d8607a7b)
+++ Core/Gui/src/Core.Gui/Forms/Main/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 38628d40c8fe8a67f2186bce447026397907e9eb)
@@ -633,13 +633,9 @@
                 mapUserControl.VisibleChanged += MapViewVisibleChanged;
             }
 
-            var chartView = e.View as IChartView;
-            if (chartView != null && e.View is UserControl chartUserControl)
-            {
-                chartUserControl.VisibleChanged += ChartViewVisibleChanged;
-            }
-
             UpdateComponentsForMapView(mapView);
+
+            var chartView = e.View as IChartView;
             UpdateComponentsForChartView(chartView);
 
             if (e.View is MapLegendView || e.View is ChartLegendView)
@@ -658,27 +654,13 @@
             var control = (UserControl) sender;
             if (control.Width != 0.0 && control.Height != 0.0)
             {
-                ((IMapView) control).Map.ZoomToVisibleLayers();
+                IMapControl mapControl = ((IMapView) control).Map;
+                mapControl.ZoomToVisibleLayers();
 
                 control.VisibleChanged -= MapViewVisibleChanged;
             }
         }
 
-        /// <summary>
-        /// Fix for getting around the latency within AvalonDock; ensure any opened chart view is zoomed to its extents, but first wait until it is completely visible.
-        /// </summary>
-        private static void ChartViewVisibleChanged(object sender, EventArgs e)
-        {
-            var control = (UserControl) sender;
-            if (control.Width != 0.0 && control.Height != 0.0)
-            {
-                IChartControl chartControl = ((IChartView) control).Chart;
-                chartControl.ZoomToVisibleSeries(chartControl.Data);
-
-                control.VisibleChanged -= ChartViewVisibleChanged;
-            }
-        }
-
         private void OnViewBroughtToFront(object sender, ViewChangeEventArgs e)
         {
             UpdateComponentsForView(e.View);
Index: Core/Gui/test/Core.Gui.Test/Forms/Main/MainWindowTest.cs
===================================================================
diff -u -r944d8f057924d6aa559f248328b07bf5d8607a7b -r38628d40c8fe8a67f2186bce447026397907e9eb
--- Core/Gui/test/Core.Gui.Test/Forms/Main/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision 944d8f057924d6aa559f248328b07bf5d8607a7b)
+++ Core/Gui/test/Core.Gui.Test/Forms/Main/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision 38628d40c8fe8a67f2186bce447026397907e9eb)
@@ -630,39 +630,6 @@
         }
 
         [Test]
-        public void GivenGuiWithMapLegendView_WhenMapViewOpened_ThenMapZoomedToExtents()
-        {
-            // Given
-            var mocks = new MockRepository();
-            var projectStore = mocks.Stub<IStoreProject>();
-            var projectMigrator = mocks.Stub<IMigrateProject>();
-            var projectFactory = mocks.Stub<IProjectFactory>();
-            mocks.ReplayAll();
-
-            using (var mainWindow = new MainWindow())
-            using (var gui = new GuiCore(mainWindow, projectStore, projectMigrator, projectFactory, new GuiCoreSettings()))
-            {
-                gui.Run();
-
-                mainWindow.SetGui(gui);
-                mainWindow.InitializeToolWindows();
-
-                var testMapView = new TestMapView();
-                var map = (DotSpatialMap) ((MapControl) testMapView.Map).Controls[0].Controls[1];
-
-                Extent initialExtents = map.ViewExtents;
-
-                // When
-                gui.ViewHost.AddDocumentView(testMapView);
-
-                // Then
-                Assert.AreNotEqual(initialExtents, map.ViewExtents);
-            }
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void GivenGuiWithMapLegendView_WhenMapViewAdded_ThenComponentsUpdated()
         {
             // Given