diff --git a/src/chatbar/ChatBar.qml b/src/chatbar/ChatBar.qml
index e726d23a6..d5d9672ea 100644
--- a/src/chatbar/ChatBar.qml
+++ b/src/chatbar/ChatBar.qml
@@ -78,19 +78,6 @@ Item {
         room: root.currentRoom
         maxAvailableWidth: chatBarSizeHelper.availableWidth
     }
-    MouseArea {
-        id: hoverArea
-        anchors {
-            top: chatModeButton.top
-            left: root.left
-            right: root.right
-            bottom: core.top
-        }
-        propagateComposedEvents: true
-        hoverEnabled: true
-        acceptedButtons: Qt.NoButton
-    }
-
     LibNeoChat.DelegateSizeHelper {
         id: chatBarSizeHelper
         parentItem: root
diff --git a/src/chatbar/SendBar.qml b/src/chatbar/SendBar.qml
index 97c02d7ac..4a23e06c1 100644
--- a/src/chatbar/SendBar.qml
+++ b/src/chatbar/SendBar.qml
@@ -194,9 +194,8 @@ RowLayout {
         icon.name: "edit-select-text-symbolic"
         text: i18nc("@action:button", "Rich Text")
         display: QQC2.AbstractButton.IconOnly
-        onClicked: NeoChatConfig.sendMessageWith = NeoChatConfig.sendMessageWith === 0 ? 1 : 0
+        onClicked: NeoChatConfig.sendMessageWith = checked
         checkable: true
-        checked: NeoChatConfig === 1
         
         QQC2.ToolTip.visible: hovered
         QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay