diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 7734fe120305923f18e3901430ade94135ea1fcd..a098368236588c7cda49cf6dec1de795192795cf 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -84,11 +84,6 @@ Item {
 
     FlightDisplayViewController { id: _controller }
 
-    MissionController {
-        id: _missionController
-        Component.onCompleted: start(false /* editMode */)
-    }
-
     function reloadContents() {
         if(_flightVideo) {
             _flightVideo.visible = false
diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index a6473655caf9ec7bf3518a327ef98d2db62411d5..4133640a93c3586426dfba7577f478faea63ddc1 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -54,6 +54,11 @@ FlightMap {
         }
     }
 
+    MissionController {
+        id: _missionController
+        Component.onCompleted: start(false /* editMode */)
+    }
+
     // Home position
     MissionItemIndicator {
         label:          "H"