diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml
index 843ee7ce95ffb04cbae8f8f09df616d692ee2921..3f2f50bf78e427a540a86be951021523359f48e3 100644
--- a/src/QmlControls/ScreenTools.qml
+++ b/src/QmlControls/ScreenTools.qml
@@ -108,15 +108,13 @@ Item {
         smallFontPointSize      = defaultFontPointSize  * _screenTools.smallFontPointRatio
         mediumFontPointSize     = defaultFontPointSize  * _screenTools.mediumFontPointRatio
         largeFontPointSize      = defaultFontPointSize  * _screenTools.largeFontPointRatio
-        if (isShortScreen) {
-            // For short screens using physical sizing leads ends up being too large. So we fall back to font
-            // based sizing.
+        minTouchPixels          = Math.round(minTouchMillimeters * Screen.pixelDensity)
+        if (minTouchPixels / Screen.height > 0.15) {
+            // If using physical sizing takes up too much o fthe vertical real estate fall back to font based sizing
             minTouchPixels      = defaultFontPixelHeight * 3
-        } else {
-            // For larger screens we can set min touch sizing to physical sizing
-            minTouchPixels      = Math.round(minTouchMillimeters * Screen.pixelDensity)
         }
 
+        console.log(minTouchPixels / Screen.height)
         toolbarHeight           = isMobile ? minTouchPixels : defaultFontPixelHeight * 3
     }