diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py
index af553d335..a564833cb 100644
--- a/src/filetransfers_window.py
+++ b/src/filetransfers_window.py
@@ -759,7 +759,7 @@ class FileTransfersWindow:
         pointer = w.get_device_position(device)
         props = widget.get_path_at_pos(int(event.x), int(event.y))
         self.height_diff = pointer[2] - int(event.y)
-        if self.tooltip.timeout > 0:
+        if self.tooltip.timeout > 0 or self.tooltip.shown:
             if not props or self.tooltip.id != props[0]:
                 self.tooltip.hide_tooltip()
         if props:
@@ -788,7 +788,7 @@ class FileTransfersWindow:
         pointer = w.get_device_position(device)
         props = self.tree.get_path_at_pos(pointer[1],
             pointer[2] - self.height_diff)
-        if self.tooltip.timeout > 0:
+        if self.tooltip.timeout > 0 or self.tooltip.shown:
             if not props or self.tooltip.id == props[0]:
                 self.tooltip.hide_tooltip()
 
@@ -956,6 +956,7 @@ class FileTransfersWindow:
         self.set_status(file_props, 'stop')
 
     def show_tooltip(self, widget):
+        self.tooltip.timeout = 0
         if self.height_diff == 0:
             self.tooltip.hide_tooltip()
             return
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 941100fed..17101b347 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -2714,7 +2714,7 @@ class GroupchatControl(ChatControlBase):
 
     def on_list_treeview_leave_notify_event(self, widget, event):
         props = widget.get_path_at_pos(int(event.x), int(event.y))
-        if self.tooltip.timeout > 0:
+        if self.tooltip.timeout > 0 or self.tooltip.shown:
             if not props or self.tooltip.id == props[0]:
                 self.tooltip.hide_tooltip()