diff --git a/imports/NeoChat/Component/ChatTextInput.qml b/imports/NeoChat/Component/ChatTextInput.qml
index b7145395f..0af6dd8f3 100644
--- a/imports/NeoChat/Component/ChatTextInput.qml
+++ b/imports/NeoChat/Component/ChatTextInput.qml
@@ -35,6 +35,7 @@ ToolBar {
     position: ToolBar.Footer
 
     contentItem: ColumnLayout {
+        id: layout
         spacing: 0
         EmojiPicker {
             id: emojiPicker
@@ -367,12 +368,14 @@ ToolBar {
                 id: emojiButton
                 icon.name: "preferences-desktop-emoticons"
                 icon.color: "transparent"
+                Layout.alignment: Qt.AlignTop
 
                 onClicked: emojiPicker.visible = !emojiPicker.visible
             }
 
             ToolButton {
                 id: uploadButton
+                Layout.alignment: Qt.AlignTop
 
                 visible: !isReply && !hasAttachment
 
@@ -404,6 +407,7 @@ ToolBar {
             ToolButton {
                 icon.name: "document-send"
                 icon.color: "transparent"
+                Layout.alignment: Qt.AlignTop
 
                 onClicked: {
                     inputField.postMessage(inputField.text)