diff --git a/src/settings/EmoticonEditorPage.qml b/src/settings/EmoticonEditorPage.qml
index b2eac1f49..c7f676a2f 100644
--- a/src/settings/EmoticonEditorPage.qml
+++ b/src/settings/EmoticonEditorPage.qml
@@ -99,12 +99,15 @@ FormCard.FormCardPage {
             id: shortcode
             label: i18n("Shortcode:")
             text: root.shortcode
+            onTextChanged: root.shortcode = text
         }
         FormCard.FormTextFieldDelegate {
             id: description
             label: i18n("Description:")
             text: root.description
+            onTextChanged: root.description = text
         }
+        FormCard.FormDelegateSeparator {}
         FormCard.FormButtonDelegate {
             id: save
             text: i18n("Save")