diff --git a/content/html/content/src/nsHTMLLabelElement.cpp b/content/html/content/src/nsHTMLLabelElement.cpp
index 845c0f7ffc9..90e9ed33f92 100644
--- a/content/html/content/src/nsHTMLLabelElement.cpp
+++ b/content/html/content/src/nsHTMLLabelElement.cpp
@@ -223,7 +223,8 @@ nsHTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
         if (NS_IS_MOUSE_LEFT_CLICK(aVisitor.mEvent)) {
           if (ShouldFocus(this)) {
             // Focus the for content.
-            content->SetFocus(aVisitor.mPresContext);
+            aVisitor.mPresContext->EventStateManager()->
+              ChangeFocusWith(content, nsIEventStateManager::eEventFocusedByKey);
           }
 
           // Dispatch a new click event to |content|