--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -670,17 +670,19 @@ void nsTextControlFrame::SetFocus(bool a
     if (doc) {
       nsIFocusManager* fm = nsFocusManager::GetFocusManager();
       if (fm) {
         fm->GetLastFocusMethod(doc->GetWindow(), &lastFocusMethod);
       }
     }
     if (!(lastFocusMethod & nsIFocusManager::FLAG_BYMOUSE)) {
       RefPtr<ScrollOnFocusEvent> event = new ScrollOnFocusEvent(this);
-      nsresult rv = NS_DispatchToCurrentThread(event);
+      nsresult rv = mContent->OwnerDoc()->Dispatch("ScrollOnFocusEvent",
+                                                   TaskCategory::Other,
+                                                   do_AddRef(event));
       if (NS_SUCCEEDED(rv)) {
         mScrollEvent = event;
       }
     }
   }
 
   // tell the caret to use our selection
   caret->SetSelection(ourSel);