diff --git a/src/app/commoncomponents/MaterialTextField.qml b/src/app/commoncomponents/MaterialTextField.qml
index 129a2212e5271812aaf65b7985e39e055ef20e65..9ac60261bb6edcdf9175656494a7a7d5247a9c68 100644
--- a/src/app/commoncomponents/MaterialTextField.qml
+++ b/src/app/commoncomponents/MaterialTextField.qml
@@ -36,6 +36,7 @@ TextField {
     }
 
     signal keyPressed
+    signal rejected
 
     property bool inputIsValid: true
 
@@ -87,6 +88,9 @@ TextField {
                 root.accepted();
             }
             event.accepted = true;
+        } else if (event.key === Qt.Key_Escape) {
+            root.focus = false;
+            root.rejected();
         } else {
             root.keyPressed();
         }
diff --git a/src/app/commoncomponents/ModalTextEdit.qml b/src/app/commoncomponents/ModalTextEdit.qml
index 94de2686cf826e09940cba447fcb78b57c60431f..a2330fa80efde1f002184cfcf526042f384f0755 100644
--- a/src/app/commoncomponents/ModalTextEdit.qml
+++ b/src/app/commoncomponents/ModalTextEdit.qml
@@ -122,6 +122,10 @@ Loader {
             echoMode: root.echoMode
             placeholderText: root.placeholderText
             onAccepted: root.accepted()
+            onRejected: {
+                root.editMode = false;
+                text = staticText;
+            }
             onKeyPressed: root.keyPressed()
             onTextChanged: dynamicText = text
             text: staticText
diff --git a/src/app/mainview/components/SwarmDetailsPanel.qml b/src/app/mainview/components/SwarmDetailsPanel.qml
index 9b818530c59fe3ec1b0a55d71a9418052fa95d53..09471a6d5e51d72f42a2bf71c4d6676b39d8d1bf 100644
--- a/src/app/mainview/components/SwarmDetailsPanel.qml
+++ b/src/app/mainview/components/SwarmDetailsPanel.qml
@@ -51,7 +51,6 @@ Rectangle {
             anchors.right: parent.right
             height: headerRow.implicitHeight + JamiTheme.preferredMarginSize + settingsTabButton.height
 
-
             RowLayout {
                 id: headerRow
                 spacing: 15
@@ -105,7 +104,7 @@ Rectangle {
                         }
 
                         editMode: false
-                        isPersistent: false
+
                         placeholderText: JamiStrings.title
 
                         onActiveFocusChanged: {
@@ -148,7 +147,6 @@ Rectangle {
                         onAccepted: ConversationsAdapter.updateConversationDescription(LRCInstance.selectedConvUid, dynamicText)
 
                         editMode: false
-                        isPersistent: false
 
                         onActiveFocusChanged: {
                             if (!activeFocus) {
diff --git a/src/app/settingsview/components/CustomizeProfilePage.qml b/src/app/settingsview/components/CustomizeProfilePage.qml
index 6cb2e8695707d0d7182bfe9fc0aedde9a63305c5..6fb97804cbab43e355ed46226024c24a246118b6 100644
--- a/src/app/settingsview/components/CustomizeProfilePage.qml
+++ b/src/app/settingsview/components/CustomizeProfilePage.qml
@@ -76,16 +76,13 @@ SettingsPageBase {
                     font.pixelSize: JamiTheme.materialLineEditPixelSize
                 }
 
-                maxCharacters: JamiTheme.maximumCharacters
-                placeholderText: JamiStrings.displayName
-
-                editMode: false
-                isPersistent: false
-
                 Layout.alignment: Qt.AlignCenter
                 Layout.preferredHeight: JamiTheme.preferredFieldHeight + 8
                 Layout.fillWidth: true
 
+                maxCharacters: JamiTheme.maximumCharacters
+                placeholderText: JamiStrings.displayName
+
                 staticText: CurrentAccount.alias
                 elidedText: displayNameLineEditTextSize.elidedText
 
diff --git a/src/app/settingsview/components/SettingsMaterialTextEdit.qml b/src/app/settingsview/components/SettingsMaterialTextEdit.qml
index 1f638607a21eea9b4e2117158021fe5aaad2e892..f824c54eda440c53b39b0110517325a2af020d84 100644
--- a/src/app/settingsview/components/SettingsMaterialTextEdit.qml
+++ b/src/app/settingsview/components/SettingsMaterialTextEdit.qml
@@ -78,7 +78,6 @@ RowLayout {
         }
 
         editMode: false
-        isPersistent: false
 
         onActiveFocusChanged: {
             if (!activeFocus) {