diff --git a/src/declarativeimports/plasmacomponents/qml/TextArea.qml b/src/declarativeimports/plasmacomponents/qml/TextArea.qml
index 6f9269119..176fca3ab 100644
--- a/src/declarativeimports/plasmacomponents/qml/TextArea.qml
+++ b/src/declarativeimports/plasmacomponents/qml/TextArea.qml
@@ -393,11 +393,6 @@ Item {
                 color: theme.buttonTextColor
                 opacity: 0.5
             }
-            onActiveFocusChanged: {
-                if (!textEdit.activeFocus) {
-                    textEdit.closeSoftwareInputPanel()
-                }
-            }
         }
     }
 
diff --git a/src/declarativeimports/plasmacomponents/qml/TextField.qml b/src/declarativeimports/plasmacomponents/qml/TextField.qml
index da392bea0..e790eadad 100644
--- a/src/declarativeimports/plasmacomponents/qml/TextField.qml
+++ b/src/declarativeimports/plasmacomponents/qml/TextField.qml
@@ -350,11 +350,6 @@ FocusScope {
         enabled: textField.enabled
         clip: true
         focus: true
-        onActiveFocusChanged: {
-            if (!textField.activeFocus) {
-                textInput.closeSoftwareInputPanel()
-            }
-        }
         onAccepted: textField.accepted()
         Keys.forwardTo: textField
     }
@@ -364,7 +359,7 @@ FocusScope {
         source: "edit-clear-locationbar-rtl"
         height: Math.max(textInput.height, theme.smallIconSize)
         width: height
-        opacity: (textInput.text != "" && clearButtonShown) ? 1 : 0
+        opacity: (textInput.text != "" && clearButtonShown && textField.enabled) ? 1 : 0
         Behavior on opacity {
             NumberAnimation {
                 duration: 250
@@ -373,7 +368,7 @@ FocusScope {
         }
         anchors {
             right: parent.right
-            rightMargin: y
+            rightMargin: 6
             verticalCenter: textInput.verticalCenter
         }
         MouseArea {