diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index fb4e3b53fa2fd4773c19305e6a50a4c70073c4a0..9423afffd97db5afce3503571829d8fe21e5c893 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -373,13 +373,17 @@ QGCView {
                     MouseArea {
                         // This MouseArea prevents the Map below it from getting Mouse events. Without this
                         // things like mousewheel will scroll the Flickable and then scroll the map as well.
-                        anchors.fill:       parent
+                        anchors.fill:       editorListView
                         preventStealing:    true
                         onWheel:            wheel.accepted = true
                     }
 
                     ListView {
-                        anchors.fill:   parent
+                        id:             editorListView
+                        anchors.left:   parent.left
+                        anchors.right:  parent.right
+                        anchors.top:    parent.top
+                        height:         Math.min(contentHeight, parent.height)
                         spacing:        _margin / 2
                         orientation:    ListView.Vertical
                         model:          controller.missionItems