diff --git a/src/app/commoncomponents/MaterialTextField.qml b/src/app/commoncomponents/MaterialTextField.qml
index b63f5d294d09b608718550d7d123e6bb0657a77c..4b4096c961fcad305b1e3d5a9bbb78b3c682cebf 100644
--- a/src/app/commoncomponents/MaterialTextField.qml
+++ b/src/app/commoncomponents/MaterialTextField.qml
@@ -50,7 +50,6 @@ TextField {
     placeholderTextColor: !isActive
                           ? JamiTheme.transparentColor
                           : JamiTheme.placeholderTextColor
-    property string initialPlaceholderText
 
     property alias infoTipText: infoTip.text
 
@@ -106,7 +105,7 @@ TextField {
         font.pointSize: root.font.pointSize
         anchors.baseline: root.baseline
         anchors.horizontalCenter: root.horizontalCenter
-        text: root.initialPlaceholderText
+        text: root.placeholderText
         color: root.baseColor
         visible: !root.isActive && !readOnly && root.text.toString() === ""
     }
@@ -147,11 +146,11 @@ TextField {
         font.pointSize: root.font.pointSize - 3
         anchors.top: baselineLine.bottom
         anchors.topMargin: 2
-        text: root.initialPlaceholderText
+        text: root.placeholderText
         color: root.baseColor
 
         // Show the alternate placeholder while the user types.
-        visible: root.isActive && !readOnly
+        visible: root.isActive && !readOnly && root.text.toString() !== ""
     }
 
     TextFieldIcon {
diff --git a/src/app/commoncomponents/ModalTextEdit.qml b/src/app/commoncomponents/ModalTextEdit.qml
index 33bbb24a371d79bb4cb62e69cf922e9711682c6c..76548e4fc512e1b38d985b0281e185e198c59c0c 100644
--- a/src/app/commoncomponents/ModalTextEdit.qml
+++ b/src/app/commoncomponents/ModalTextEdit.qml
@@ -92,7 +92,7 @@ Loader {
             font.pointSize: root.fontPointSize
             font.bold: root.fontBold
             echoMode: root.echoMode
-            initialPlaceholderText: root.placeholderText
+            placeholderText: root.placeholderText
             onAccepted: root.accepted()
             onTextChanged: dynamicText = text
             text: staticText