--- a/layout/xul/nsXULTooltipListener.cpp
+++ b/layout/xul/nsXULTooltipListener.cpp
@@ -191,23 +191,26 @@ nsXULTooltipListener::MouseMove(nsIDOMEv
           return;
         }
 
         targetContent = targetContent->GetParent();
       }
     }
 
     mTooltipTimer = do_CreateInstance("@mozilla.org/timer;1");
+    mTooltipTimer->SetTarget(
+        sourceContent->OwnerDoc()->EventTargetFor(TaskCategory::Other));
     if (mTooltipTimer) {
       mTargetNode = do_GetWeakReference(eventTarget);
       if (mTargetNode) {
         nsresult rv =
-          mTooltipTimer->InitWithFuncCallback(sTooltipCallback, this,
+          mTooltipTimer->InitWithNamedFuncCallback(sTooltipCallback, this,
             LookAndFeel::GetInt(LookAndFeel::eIntID_TooltipDelay, 500),
-            nsITimer::TYPE_ONE_SHOT);
+            nsITimer::TYPE_ONE_SHOT,
+            "sTooltipCallback");
         if (NS_FAILED(rv)) {
           mTargetNode = nullptr;
           mSourceNode = nullptr;
         }
       }
     }
     return;
   }