diff --git a/imports/NeoChat/Component/ChatTextInput.qml b/imports/NeoChat/Component/ChatTextInput.qml
index de4a08451..be576447c 100644
--- a/imports/NeoChat/Component/ChatTextInput.qml
+++ b/imports/NeoChat/Component/ChatTextInput.qml
@@ -376,7 +376,9 @@ ToolBar {
                 icon.name: "preferences-desktop-emoticons"
                 icon.color: "transparent"
 
-                onClicked: emojiPicker.visible = !emojiPicker.visible
+                checkable: true
+                checked: emojiPicker.visible
+                onToggled: emojiPicker.visible = !emojiPicker.visible
 
                 ToolTip {
                     text: i18n("Add an Emoji")