diff --git a/src/qml/Component/ChatBox/ChatBar.qml b/src/qml/Component/ChatBox/ChatBar.qml
index 886ca85d8..582d24fca 100644
--- a/src/qml/Component/ChatBox/ChatBar.qml
+++ b/src/qml/Component/ChatBox/ChatBar.qml
@@ -98,6 +98,7 @@ QQC2.Control {
                     emojiDialog.item.open()
                 }
             }
+            tooltip: text
         },
         Kirigami.Action {
             id: mapButton
@@ -109,6 +110,7 @@ QQC2.Control {
             onTriggered: {
                 locationChooserComponent.createObject(QQC2.ApplicationWindow.overlay, {room: root.currentRoom}).open()
             }
+            tooltip: text
         },
         Kirigami.Action {
             id: sendAction
@@ -384,6 +386,7 @@ QQC2.Control {
 
                 QQC2.ToolTip.visible: modelData.tooltip !== "" && hoverHandler.hovered
                 QQC2.ToolTip.text: modelData.tooltip
+                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                 HoverHandler { id: hoverHandler }
 
                 PieProgressBar {