diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml
index a32c4ee91426224222017648ee0ac140df754fd7..3e53ca502d17b2e1ed21f2f6a498c5a8b061a60c 100644
--- a/src/FlightMap/FlightMap.qml
+++ b/src/FlightMap/FlightMap.qml
@@ -374,22 +374,48 @@ Item {
 */
     }
     
-    /// Mission item list
-    Row {
-        anchors.margins:    ScreenTools.defaultFontPixelWidth
-        anchors.left:       parent.left
-        anchors.right:      controlWidgets.left
-        anchors.bottom:     parent.bottom
-        spacing:            ScreenTools.defaultFontPixelWidth
+    // Mission item list
+    ScrollView {
+        id:                         missionItemScroll
+        anchors.margins:            ScreenTools.defaultFontPixelWidth
+        anchors.left:               parent.left
+        anchors.right:              controlWidgets.left
+        anchors.bottom:             parent.bottom
+        height:                     missionItemRow.height + _scrollBarHeightAdjust
+        verticalScrollBarPolicy:    Qt.ScrollBarAlwaysOff
+        opacity:                    0.75
+        
+        property bool _scrollBarShown: missionItemRow.width > missionItemScroll.width
+        property real _scrollBarHeightAdjust: _scrollBarShown ? (scrollBarHeight.height - scrollBarHeight.viewport.height) + 5 : 0
         
-        Repeater {
-            model: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.missionItems : 0
+        Row {
+            id:         missionItemRow
+            spacing:    ScreenTools.defaultFontPixelWidth
             
-            MissionItemSummary {
-                missionItem:        modelData
+            Repeater {
+                model: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.missionItems : 0
+                
+                MissionItemSummary {
+                    opacity:        0.75
+                    missionItem:    modelData
+                }
             }
         }
     }
+    
+    // This is used to determine the height of a horizontal scroll bar
+    ScrollView {
+        id:     scrollBarHeight
+        x:      10000
+        y:      10000
+        width:  100
+        height: 100
+        
+        Rectangle {
+            height: 50
+            width:  200
+        }
+    }
 
     /// Map control widgets
     Column {
diff --git a/src/QmlControls/MissionItemSummary.qml b/src/QmlControls/MissionItemSummary.qml
index 673db7aa55ef6a75e930abea30c3e3aea6044a44..54a1088af37ae9d492eac0394f0faefda53883b8 100644
--- a/src/QmlControls/MissionItemSummary.qml
+++ b/src/QmlControls/MissionItemSummary.qml
@@ -13,7 +13,6 @@ Rectangle {
     border.width:   2
     border.color:   "white"
     color:          "white"
-    opacity:        0.75
     radius:         ScreenTools.defaultFontPixelWidth
 
     MissionItemIndexLabel {