diff --git a/declarativeimports/plasmacomponents/qml/TextArea.qml b/declarativeimports/plasmacomponents/qml/TextArea.qml
index 6b229a554..d3d426993 100644
--- a/declarativeimports/plasmacomponents/qml/TextArea.qml
+++ b/declarativeimports/plasmacomponents/qml/TextArea.qml
@@ -187,6 +187,11 @@ Item {
                 visible: textEdit.text == "" && !textArea.activeFocus
                 opacity: 0.5
             }
+            onActiveFocusChanged: {
+                if (!textField.activeFocus) {
+                    textInput.closeSoftwareInputPanel()
+                }
+            }
         }
     }
 
diff --git a/declarativeimports/plasmacomponents/qml/TextField.qml b/declarativeimports/plasmacomponents/qml/TextField.qml
index 248d010cc..90e147df7 100644
--- a/declarativeimports/plasmacomponents/qml/TextField.qml
+++ b/declarativeimports/plasmacomponents/qml/TextField.qml
@@ -155,6 +155,11 @@ Item {
         color: theme.textColor
         enabled: textField.enabled
         clip: true
+        onActiveFocusChanged: {
+            if (!textField.activeFocus) {
+                textInput.closeSoftwareInputPanel()
+            }
+        }
 
         // Proxying keys events  is not required by the
         //     common API but is desired in the plasma API.