diff --git a/src/app/mainview/components/FilterTabButton.qml b/src/app/mainview/components/FilterTabButton.qml
index af812e31..7e642bca 100644
--- a/src/app/mainview/components/FilterTabButton.qml
+++ b/src/app/mainview/components/FilterTabButton.qml
@@ -33,6 +33,8 @@ TabButton {
     property var hoverColor: JamiTheme.backgroundColor
     property var textColor: JamiTheme.textColor
     property var textColorHovered: JamiTheme.textColorHovered
+    property var underlineColor: textColor
+    property var underlineColorHovered: textColorHovered
     property var borderWidth: 2
     property var bottomMargin: 1
     property var underlineContentOnly: false
@@ -85,10 +87,10 @@ TabButton {
         height: borderWidth
         color: {
             if (!root.down && root.hovered)
-                return root.textColorHovered;
+                return underlineColorHovered;
             if (!root.down)
                 return "transparent";
-            return root.textColor;
+            return root.underlineColor;
         }
     }
 
diff --git a/src/app/mainview/components/MessagesResearchPanel.qml b/src/app/mainview/components/MessagesResearchPanel.qml
index f98cf722..014c88bf 100644
--- a/src/app/mainview/components/MessagesResearchPanel.qml
+++ b/src/app/mainview/components/MessagesResearchPanel.qml
@@ -59,6 +59,8 @@ Rectangle {
                 bottomMargin: JamiTheme.settingsMarginSize
                 fontSize: JamiTheme.menuFontSize
                 underlineContentOnly: true
+                underlineColor: CurrentConversation.color
+                underlineColorHovered: CurrentConversation.color
 
                 down: researchTabBar.currentIndex === 0
                 labelText: JamiStrings.messages
@@ -73,6 +75,9 @@ Rectangle {
                 bottomMargin: JamiTheme.settingsMarginSize
                 fontSize: JamiTheme.menuFontSize
                 underlineContentOnly: true
+                underlineColor: CurrentConversation.color
+                underlineColorHovered: CurrentConversation.color
+
 
                 down: researchTabBar.currentIndex === 1
                 labelText: JamiStrings.files