diff --git a/modules/corelib/ui/tooltip.lua b/modules/corelib/ui/tooltip.lua
index d5c61159..66c44a62 100644
--- a/modules/corelib/ui/tooltip.lua
+++ b/modules/corelib/ui/tooltip.lua
@@ -62,7 +62,6 @@ function g_tooltip.init()
     toolTipLabel:setBackgroundColor('#111111cc')
     toolTipLabel:setTextAlign(AlignCenter)
     toolTipLabel:hide()
-    toolTipLabel.onMouseMove = function() moveToolTip() end
   end)
 end
 
@@ -89,10 +88,18 @@ function g_tooltip.display(text)
   toolTipLabel:enable()
   g_effects.fadeIn(toolTipLabel, 100)
   moveToolTip(true)
+
+  connect(rootWidget, {
+    onMouseMove = moveToolTip,
+  })
 end
 
 function g_tooltip.hide()
   g_effects.fadeOut(toolTipLabel, 100)
+
+  disconnect(rootWidget, {
+    onMouseMove = moveToolTip,
+  })
 end