diff --git a/src/PlanView/MissionItemStatus.qml b/src/PlanView/MissionItemStatus.qml
index dc654e965062b85eba657903b2f3b79a955d5435..596d886b368d36dfc0f1f1803dab6a16ba9a6d8a 100644
--- a/src/PlanView/MissionItemStatus.qml
+++ b/src/PlanView/MissionItemStatus.qml
@@ -20,7 +20,6 @@ import QGroundControl.FactControls  1.0
 
 Rectangle {
     id:         root
-    height:     ScreenTools.defaultFontPixelHeight * 7
     radius:     ScreenTools.defaultFontPixelWidth * 0.5
     color:      qgcPal.window
     opacity:    0.80
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 97be7f47e7c98365dbb110b550ac3c45b727fcbb..53c2c2dedee0e307fc52bc3271a32a58001b32fd 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -14,6 +14,7 @@ import QtQuick.Dialogs  1.2
 import QtLocation       5.3
 import QtPositioning    5.3
 import QtQuick.Layouts  1.2
+import QtQuick.Window   2.2
 
 import QGroundControl               1.0
 import QGroundControl.FlightMap     1.0
@@ -652,10 +653,11 @@ QGCView {
             id:                 waypointValuesDisplay
             anchors.margins:    ScreenTools.defaultFontPixelWidth
             anchors.left:       parent.left
+            height:             ScreenTools.defaultFontPixelHeight * 7
             maxWidth:           parent.width - rightPanel.width - x
             anchors.bottom:     parent.bottom
             missionItems:       _missionController.visualItems
-            visible:            _editingLayer === _layerMission && !ScreenTools.isShortScreen
+            visible:            _editingLayer === _layerMission && (ScreenTools.isMobile ? height < Screen.height * 0.25 : true)
         }
     } // QGCViewPanel