diff --git a/src/app/commoncomponents/ShareMenu.qml b/src/app/commoncomponents/ShareMenu.qml
index 17a94d8bb..dcadb04a0 100644
--- a/src/app/commoncomponents/ShareMenu.qml
+++ b/src/app/commoncomponents/ShareMenu.qml
@@ -22,6 +22,7 @@ import "contextmenu"
 
 BaseContextMenu {
     id: root
+
     property var modelList
     signal audioRecordMessageButtonClicked
     signal videoRecordMessageButtonClicked
@@ -31,35 +32,63 @@ BaseContextMenu {
         GeneralMenuItem {
             id: audioMessage
 
+            Accessible.role: Accessible.MenuItem
+            Accessible.name: itemName
+            focusPolicy: Qt.StrongFocus
+            Keys.onReturnPressed: clicked()
+
             canTrigger: true
             iconSource: JamiResources.message_audio_black_24dp_svg
             itemName: JamiStrings.leaveAudioMessage
             onClicked: {
                 root.audioRecordMessageButtonClicked();
+                root.close()
             }
+
+            KeyNavigation.tab: videoMessage
+            KeyNavigation.backtab: shareLocation
         },
         GeneralMenuItem {
             id: videoMessage
 
+            Accessible.role: Accessible.MenuItem
+            Accessible.name: itemName
+
+            focusPolicy: Qt.StrongFocus
+            Keys.onReturnPressed: clicked()
+
             canTrigger: true
             iconSource: JamiResources.message_video_black_24dp_svg
             itemName: JamiStrings.leaveVideoMessage
-
             isActif: VideoDevices.listSize !== 0
 
             onClicked: {
                 root.videoRecordMessageButtonClicked();
+                root.close()
             }
+
+            KeyNavigation.tab: shareLocation
+            KeyNavigation.backtab: audioMessage
         },
         GeneralMenuItem {
             id: shareLocation
 
+            Accessible.role: Accessible.MenuItem
+            Accessible.name: itemName
+
+            focusPolicy: Qt.StrongFocus
+            Keys.onReturnPressed: clicked()
+
             canTrigger: true
             iconSource: JamiResources.localisation_sharing_send_pin_svg
             itemName: JamiStrings.shareLocation
             onClicked: {
                 root.showMapClicked();
+                root.close()
             }
+
+            KeyNavigation.tab: audioMessage
+            KeyNavigation.backtab: videoMessage
         }
     ]
 
diff --git a/src/app/mainview/components/FilterTabButton.qml b/src/app/mainview/components/FilterTabButton.qml
index d19fa66b6..67b2eb342 100644
--- a/src/app/mainview/components/FilterTabButton.qml
+++ b/src/app/mainview/components/FilterTabButton.qml
@@ -45,7 +45,6 @@ TabButton {
 
     Accessible.name: root.labelText
     Accessible.role: Accessible.Button
-    Accessible.description: root.acceleratorSequence
 
     Rectangle {
         id: contentRect
diff --git a/src/app/mainview/components/MessageFormatBar.qml b/src/app/mainview/components/MessageFormatBar.qml
index 9133a6d60..1f559073f 100644
--- a/src/app/mainview/components/MessageFormatBar.qml
+++ b/src/app/mainview/components/MessageFormatBar.qml
@@ -479,6 +479,9 @@ Rectangle {
                 anchors.bottom: parent.bottom
                 enabled: !showPreview
                 hoverEnabled: !showPreview
+                Accessible.name: JamiStrings.showMoreMessagingOptions
+                Accessible.role: Accessible.ComboBox
+                Accessible.description: JamiStrings.showMoreMessagingOptionsDescription
 
                 // Used to choose the correct color for the button.
                 readonly property bool highlight: down || hovered
diff --git a/src/app/net/jami/Constants/JamiStrings.qml b/src/app/net/jami/Constants/JamiStrings.qml
index 602778989..0c072d1e3 100644
--- a/src/app/net/jami/Constants/JamiStrings.qml
+++ b/src/app/net/jami/Constants/JamiStrings.qml
@@ -945,4 +945,6 @@ Item {
     property string closeApplication: qsTr("Close application")
     property string dismissTip: qsTr("Dismiss this tip")
     property string tipDescription: qsTr("Tips to help you use Jami more effectively")
+    property string showMoreMessagingOptions: qsTr("Show more messaging options")
+    property string showMoreMessagingOptionsDescription: qsTr("Open a menu that allows you to send voice and video messages as well as sharing your location")
 }