diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index cb2bb45af1bd4872075b45ce92d6168b539b4398..37b0e54d3c2696bdaa1db3ee3fe803c706af8b0d 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -184,6 +184,19 @@ FlightMap {
         }
     }
 
+    Connections {
+        target: _wimaController
+
+        onVisualItemsChanged: {
+            var visualItems = _wimaController.visualItems
+            if (visualItems && visualItems.count > 0) {
+                if (recenterNeeded()){
+                    mapFitFunctions.fitMapViewportToAreas()
+                }
+            }
+        }
+    }
+
     ExclusiveGroup {
         id: _mapTypeButtonsExclusiveGroup
     }
@@ -195,6 +208,24 @@ FlightMap {
         planMasterController:       _planMasterController
 
         property real leftToolWidth:    toolStrip.x + toolStrip.width
+
+        function fitMapViewportToAreas() {
+            if (!_wimaController.visualItems) {
+                // Being called prior to controller.start
+                return
+            }
+
+            var coordList = [ ]
+            for (var i = 0; i < _wimaController.visualItems.count; i++){
+                var area = _wimaController.visualItems.get(i)
+                for (var j = 0; j < area.path.length; ++j){
+                    var vertex = area.path[j]
+                    coordList.push(vertex)
+                }
+            }
+            console.log(coordList)
+            fitMapViewportToAllCoordinates(coordList)
+        }
     }
 
     // Add wima Areas to the Map
diff --git a/src/WimaView/WimaView.qml b/src/WimaView/WimaView.qml
index 6928bf5d0355d5814442f36e973e6798a57f8325..5c8f7133654227f80eb071917099a5e80693f855 100644
--- a/src/WimaView/WimaView.qml
+++ b/src/WimaView/WimaView.qml
@@ -132,7 +132,6 @@ QGCView {
                     coordList.push(vertex)
                 }
             }
-            console.log(coordList)
             fitMapViewportToAllCoordinates(coordList)
         }
     }