diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml
index 63ea2e50873339e83098da60ab3a8e72ea6e6600..03863da4c667e2289ce35d988e81ee99bfeff091 100644
--- a/src/QmlControls/ScreenTools.qml
+++ b/src/QmlControls/ScreenTools.qml
@@ -30,8 +30,8 @@ Item {
     property bool isiOS:            ScreenToolsController.isiOS
     property bool isMobile:         ScreenToolsController.isMobile
     property bool isDebug:          ScreenToolsController.isDebug
-    property bool isTinyScreen:     (Screen.width / Screen.pixelDensity) < 120 // 120mm
-    property bool isShortScreen:    (Screen.desktopAvailableHeight / Screen.desktopAvailableWidth) < 0.6 // Nexus 7 for example
+    property bool isTinyScreen:     (Screen.width  / Screen.pixelDensity) < 120 // 120mm
+    property bool isShortScreen:    ScreenToolsController.isMobile && ((Screen.height / Screen.width) < 0.6) // Nexus 7 for example
 
     function mouseX() {
         return ScreenToolsController.mouseX()