diff --git a/src/chatbar/ChatBar.qml b/src/chatbar/ChatBar.qml
index 0796e0f70..4722e5e99 100644
--- a/src/chatbar/ChatBar.qml
+++ b/src/chatbar/ChatBar.qml
@@ -107,6 +107,19 @@ Item {
                     clip: true
 
                     ColumnLayout {
+                        readonly property real visibleTop: chatScrollView.QQC2.ScrollBar.vertical.position * chatScrollView.contentHeight
+                        readonly property real visibleBottom: chatScrollView.QQC2.ScrollBar.vertical.position * chatScrollView.contentHeight + chatScrollView.QQC2.ScrollBar.vertical.size * chatScrollView.contentHeight
+                        readonly property rect cursorRectInColumn: mapFromItem(contentModel.focusedTextItem.textItem, contentModel.focusedTextItem.cursorRectangle);
+                        onCursorRectInColumnChanged: {
+                            if (chatScrollView.QQC2.ScrollBar.vertical.visible) {
+                                if (cursorRectInColumn.y < visibleTop) {
+                                    chatScrollView.QQC2.ScrollBar.vertical.position = cursorRectInColumn.y / chatScrollView.contentHeight
+                                } else if (cursorRectInColumn.y + cursorRectInColumn.height > visibleBottom) {
+                                    chatScrollView.QQC2.ScrollBar.vertical.position = (cursorRectInColumn.y + cursorRectInColumn.height - (chatScrollView.QQC2.ScrollBar.vertical.size * chatScrollView.contentHeight)) / chatScrollView.contentHeight
+                                }
+                            }
+                        }
+
                         width: chatScrollView.width
                         spacing: Kirigami.Units.smallSpacing
 
diff --git a/src/chatbar/RichEditBar.qml b/src/chatbar/RichEditBar.qml
index 5af34a639..81b09197d 100644
--- a/src/chatbar/RichEditBar.qml
+++ b/src/chatbar/RichEditBar.qml
@@ -11,6 +11,8 @@ import org.kde.kirigami as Kirigami
 import org.kde.neochat.libneochat as LibNeoChat
 import org.kde.neochat.messagecontent as MessageContent
 
+pragma ComponentBehavior: Bound
+
 RowLayout {
     id: root
 
@@ -54,7 +56,7 @@ RowLayout {
                                                              Kirigami.Units.gridUnit
 
     readonly property ChatButtonHelper chatButtonHelper: ChatButtonHelper {
-        textItem: contentModel.focusedTextItem
+        textItem: root.contentModel.focusedTextItem
     }
 
     signal clicked
@@ -66,7 +68,7 @@ RowLayout {
             onActivated: boldButton.clicked()
         }
         icon.name: "format-text-bold"
-        enabled: chatButtonHelper.richFormatEnabled
+        enabled: root.chatButtonHelper.richFormatEnabled
         text: i18nc("@action:button", "Bold")
         display: QQC2.AbstractButton.IconOnly
         checkable: true
@@ -87,7 +89,7 @@ RowLayout {
             onActivated: italicButton.clicked()
         }
         icon.name: "format-text-italic"
-        enabled: chatButtonHelper.richFormatEnabled
+        enabled: root.chatButtonHelper.richFormatEnabled
         text: i18nc("@action:button", "Italic")
         display: QQC2.AbstractButton.IconOnly
         checkable: true
@@ -111,7 +113,7 @@ RowLayout {
                 onActivated: underlineButton.clicked()
             }
             icon.name: "format-text-underline"
-            enabled: chatButtonHelper.richFormatEnabled
+            enabled: root.chatButtonHelper.richFormatEnabled
             text: i18nc("@action:button", "Underline")
             display: QQC2.AbstractButton.IconOnly
             checkable: true
@@ -127,7 +129,7 @@ RowLayout {
         }
         QQC2.ToolButton {
             icon.name: "format-text-strikethrough"
-            enabled: chatButtonHelper.richFormatEnabled
+            enabled: root.chatButtonHelper.richFormatEnabled
             text: i18nc("@action:button", "Strikethrough")
             display: QQC2.AbstractButton.IconOnly
             checkable: true
@@ -146,12 +148,12 @@ RowLayout {
         id: compressedExtraTextFormatButton
         visible: root.maxAvailableWidth < root.listCompressedImplicitWidth
         icon.name: "dialog-text-and-font"
-        enabled: chatButtonHelper.richFormatEnabled
+        enabled: root.chatButtonHelper.richFormatEnabled
         text: i18nc("@action:button", "Format Text")
         display: QQC2.AbstractButton.IconOnly
         checkable: true
         onClicked: {
-            let dialog = compressedTextFormatMenu.createObject(compressedExtraTextFormatButton)
+            let dialog = compressedTextFormatMenu.createObject(compressedExtraTextFormatButton) as QQC2.Menu
             dialog.onClosed.connect(() => {
                 compressedExtraTextFormatButton.checked = false;
             });
@@ -235,7 +237,7 @@ RowLayout {
         checkable: true
 
         onClicked: {
-            let dialog = emojiDialog.createObject(root).open();
+            let dialog = (emojiDialog.createObject(root) as EmojiDialog).open();
         }
         QQC2.ToolTip.visible: hovered
         QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
@@ -267,7 +269,7 @@ RowLayout {
         visible: root.maxAvailableWidth > root.uncompressedImplicitWidth
         QQC2.ToolButton {
             icon.name: "format-list-unordered"
-            enabled: chatButtonHelper.richFormatEnabled
+            enabled: root.chatButtonHelper.richFormatEnabled
             text: i18nc("@action:button", "Unordered List")
             display: QQC2.AbstractButton.IconOnly
             checkable: true
@@ -283,11 +285,11 @@ RowLayout {
         }
         QQC2.ToolButton {
             icon.name: "format-list-ordered"
-            enabled: chatButtonHelper.richFormatEnabled
+            enabled: root.chatButtonHelper.richFormatEnabled
             text: i18nc("@action:button", "Ordered List")
             display: QQC2.AbstractButton.IconOnly
             checkable: true
-            checked: root.chatButtonHelper.orderedlist
+            checked: root.chatButtonHelper.orderedList
             onClicked: {
                 root.chatButtonHelper.setFormat(LibNeoChat.RichFormat.OrderedList);
                 root.clicked();
@@ -300,7 +302,7 @@ RowLayout {
         QQC2.ToolButton {
             id: indentAction
             icon.name: "format-indent-more"
-            enabled: chatButtonHelper.richFormatEnabled && root.chatButtonHelper.canIndentListMore
+            enabled: root.chatButtonHelper.richFormatEnabled && root.chatButtonHelper.canIndentListMore
             text: i18nc("@action:button", "Increase List Level")
             display: QQC2.AbstractButton.IconOnly
             onClicked: {
@@ -315,7 +317,7 @@ RowLayout {
         QQC2.ToolButton {
             id: dedentAction
             icon.name: "format-indent-less"
-            enabled: chatButtonHelper.richFormatEnabled && root.chatButtonHelper.canIndentListLess
+            enabled: root.chatButtonHelper.richFormatEnabled && root.chatButtonHelper.canIndentListLess
             text: i18nc("@action:button", "Decrease List Level")
             display: QQC2.AbstractButton.IconOnly
             onClicked: {
@@ -330,7 +332,7 @@ RowLayout {
     }
     QQC2.ToolButton {
         id: compressedListButton
-        enabled: chatButtonHelper.richFormatEnabled
+        enabled: root.chatButtonHelper.richFormatEnabled
         visible: root.maxAvailableWidth < root.uncompressedImplicitWidth
         icon.name: "format-list-unordered"
         text: i18nc("@action:button", "List Style")
diff --git a/src/libneochat/chattextitemhelper.h b/src/libneochat/chattextitemhelper.h
index be38fbae6..9aac1dca7 100644
--- a/src/libneochat/chattextitemhelper.h
+++ b/src/libneochat/chattextitemhelper.h
@@ -38,6 +38,11 @@ class ChatTextItemHelper : public QObject
      */
     Q_PROPERTY(QQuickItem *textItem READ textItem WRITE setTextItem NOTIFY textItemChanged)
 
+    /**
+     * @brief The QML text Item the ChatTextItemHelper is handling.
+     */
+    Q_PROPERTY(QRect cursorRectangle READ cursorRectangle NOTIFY cursorPositionChanged)
+
 public:
     enum InsertPosition {
         Cursor,