1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/ui/conversation_selector/conversation_selector_row.vala b/main/src/ui/conversation_selector/conversation_selector_row.vala
index 76cbabb3..a2588d9a 100644
--- a/main/src/ui/conversation_selector/conversation_selector_row.vala
+++ b/main/src/ui/conversation_selector/conversation_selector_row.vala
@@ -70,15 +70,15 @@ public class ConversationSelectorRow : ListBoxRow {
         // Set tooltip
         switch (conversation.type_) {
             case Conversation.Type.CHAT:
-                has_tooltip = true;
+                has_tooltip = Util.use_tooltips();
                 query_tooltip.connect ((x, y, keyboard_tooltip, tooltip) => {
-                    tooltip.set_custom(generate_tooltip());
+                    tooltip.set_custom(Util.widget_if_tooltips_active(generate_tooltip()));
                     return true;
                 });
                 break;
             case Conversation.Type.GROUPCHAT:
-                has_tooltip = true;
-                set_tooltip_text(conversation.counterpart.bare_jid.to_string());
+                has_tooltip = Util.use_tooltips();
+                set_tooltip_text(Util.string_if_tooltips_active(conversation.counterpart.bare_jid.to_string()));
                 break;
             case Conversation.Type.GROUPCHAT_PM:
                 break;