diff --git a/src/QmlControls/QGCPipable.qml b/src/QmlControls/QGCPipable.qml
index bd4f9358d5d1efacf4e6730a4af6f9a7940c511d..9c1169c1a04df88483a27c8215bbafe6ed172a58 100644
--- a/src/QmlControls/QGCPipable.qml
+++ b/src/QmlControls/QGCPipable.qml
@@ -37,7 +37,7 @@ Item {
 
     QGCButton {
         id: growButton
-        visible: !isHidden
+        visible: !isHidden && !ScreenTools.isShortScreen && !ScreenTools.isTinyScreen
         anchors.left: parent.left
         anchors.bottom: shrinkButton.top
         height: 20
@@ -50,7 +50,7 @@ Item {
 
     QGCButton {
         id: shrinkButton
-        visible: !isHidden
+        visible: !isHidden && !ScreenTools.isShortScreen && !ScreenTools.isTinyScreen
         anchors.left: parent.left
         anchors.bottom: closePIP.top
         height: 20