diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 53c2c2dedee0e307fc52bc3271a32a58001b32fd..55ac65606f39a1099a79270dbffd3e149c4b4887 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -53,6 +53,7 @@ QGCView {
     property bool   _singleComplexItem:         _missionController.complexMissionItemNames.length === 1
     property real   _toolbarHeight:             _qgcView.height - ScreenTools.availableHeight
     property int    _editingLayer:              _layerMission
+    property int    _toolStripBottom:           toolStrip.height + toolStrip.y
 
     readonly property int       _layerMission:              1
     readonly property int       _layerGeoFence:             2
@@ -646,7 +647,7 @@ QGCView {
             anchors.bottom:     waypointValuesDisplay.visible ? waypointValuesDisplay.top : parent.bottom
             anchors.left:       parent.left
             mapControl:         editorMap
-            visible:            !ScreenTools.isTinyScreen
+            visible:            _toolStripBottom < y
         }
 
         MissionItemStatus {
@@ -657,7 +658,7 @@ QGCView {
             maxWidth:           parent.width - rightPanel.width - x
             anchors.bottom:     parent.bottom
             missionItems:       _missionController.visualItems
-            visible:            _editingLayer === _layerMission && (ScreenTools.isMobile ? height < Screen.height * 0.25 : true)
+            visible:            _editingLayer === _layerMission && (_toolStripBottom + mapScale.height) < y && QGroundControl.corePlugin.options.showMissionStatus
         }
     } // QGCViewPanel
 
diff --git a/src/api/QGCOptions.h b/src/api/QGCOptions.h
index ae9fd6644d9c0c20f6fdd4c1c86fb4d65aacfd97..9d06d00bdb2fa6161f5befda061623ddd8984fa6 100644
--- a/src/api/QGCOptions.h
+++ b/src/api/QGCOptions.h
@@ -45,6 +45,7 @@ public:
     Q_PROPERTY(bool                     showOfflineMapExport            READ showOfflineMapExport           NOTIFY showOfflineMapExportChanged)
     Q_PROPERTY(bool                     showOfflineMapImport            READ showOfflineMapImport           NOTIFY showOfflineMapImportChanged)
     Q_PROPERTY(bool                     useMobileFileDialog             READ useMobileFileDialog            CONSTANT)
+    Q_PROPERTY(bool                     showMissionStatus               READ showMissionStatus              CONSTANT)
 
     /// Should QGC hide its settings menu and colapse it into one single menu (Settings and Vehicle Setup)?
     /// @return true if QGC should consolidate both menus into one.
@@ -62,6 +63,10 @@ public:
     /// @return An alternate widget (see QGCInstrumentWidget.qml, the default widget)
     virtual CustomInstrumentWidget* instrumentWidget();
 
+    /// Should the mission status indicator (Plan View) be shown?
+    /// @return Yes or no
+    virtual bool        showMissionStatus           () { return true; }
+
     /// Allows access to the full fly view window
     virtual QUrl    flyViewOverlay                  () const { return QUrl(); }
     /// By returning false you can hide the following sensor calibration pages
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 94ceabc2f25dab19614b595e96e846733d7c3f2f..457948e579289aeaade308589b500707e240ac29 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -135,6 +135,7 @@ MainWindow::MainWindow()
     _ui.setupUi(this);
     // Make sure tool bar elements all fit before changing minimum width
     setMinimumWidth(1008);
+    setMinimumHeight(520);
     configureWindowName();
 
     // Setup central widget with a layout to hold the views