diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index bb0245a8a293f32f605aa24bbcfb05f5dd33b5f1..4d6cbfb252dc07274876e2ca221b48fe4eeeeb8a 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -720,6 +720,7 @@ Item {
     property string leaveAudioMessage: qsTr("Audio message")
     property string leaveVideoMessage: qsTr("Video message")
     property string showMore: qsTr("Show more")
+    property string showLess: qsTr("Show less")
 
     property string bold: qsTr("Bold")
     property string italic: qsTr("Italic")
diff --git a/src/app/mainview/components/MessageBar.qml b/src/app/mainview/components/MessageBar.qml
index ab149b5c061c7100243a4140992da7b756dd833f..57d295fc63255aaebe8b969d6df5f3cf7a8634fe 100644
--- a/src/app/mainview/components/MessageBar.qml
+++ b/src/app/mainview/components/MessageBar.qml
@@ -98,6 +98,7 @@ RowLayout {
                     showMoreButton.indicator.color = hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor;
                     showMoreButton.background.color = hovered ? JamiTheme.hoveredButtonColor : JamiTheme.transparentColor;
                 }
+                toolTipMoreButton.text = sharePopup.opened ? JamiStrings.showLess : JamiStrings.showMore;
             }
 
             popup: SharePopup {
@@ -718,11 +719,10 @@ RowLayout {
 
                                 MaterialToolTip {
                                     id: toolTip
-
                                     parent: showMoreTypoButton
                                     visible: showMoreTypoButton.hovered && (text.length > 0)
                                     delay: Qt.styleHints.mousePressAndHoldInterval
-                                    text: JamiStrings.showMore
+                                    text: markdownPopup.visible ? JamiStrings.showLess : JamiStrings.showMore
                                 }
 
                                 background: Rectangle {
@@ -747,6 +747,7 @@ RowLayout {
                                 }
 
                                 popup: MarkdownPopup {
+                                    id: markdownPopup
                                     y: 1.5 * parent.height
                                     x: -parent.width * 2
                                     width: 155