diff --git a/org.kde.desktop/TextField.qml b/org.kde.desktop/TextField.qml
--- a/org.kde.desktop/TextField.qml
+++ b/org.kde.desktop/TextField.qml
@@ -37,7 +37,7 @@
     implicitWidth: Math.max(200,
                             placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0)
                             || contentWidth + leftPadding + rightPadding
-    implicitHeight: Math.max(contentHeight + topPadding + bottomPadding,
+    implicitHeight: Math.max(metrics.height + topPadding + bottomPadding,
                              background ? background.implicitHeight : 0,
                              placeholder.implicitHeight + topPadding + bottomPadding)
 
@@ -99,6 +99,11 @@
         elide: Text.ElideRight
     }
 
+    TextMetrics {
+        id: metrics
+        text: controlRoot.text
+        font: controlRoot.font
+    }
     background: StylePrivate.StyleItem {
         id: style