--- a/widget/windows/winrt/UIABridge.cpp
+++ b/widget/windows/winrt/UIABridge.cpp
@@ -164,16 +164,36 @@ ChildHasFocus(nsCOMPtr<nsIAccessible>& a
   return (((access->NativeState() & mozilla::a11y::states::EDITABLE) > 0) &&
            ((access->NativeState() & mozilla::a11y::states::READONLY) == 0));
 }
 
 HRESULT
 UIABridge::FocusChangeEvent()
 {
   LogFunction();
+  if (!Connected()) {
+    return UIA_E_ELEMENTNOTAVAILABLE;
+  }
+
+  nsCOMPtr<nsIAccessible> child;
+  mAccessible->GetFocusedChild(getter_AddRefs(child));
+  if (!child) {
+    return S_OK;
+  }
+
+  if (!ChildHasFocus(child)) {
+    ComPtr<IUIAElement> element;
+    gElement.As(&element);
+    if (!element) {
+      return S_OK;
+    }
+    element->ClearFocus();
+    UiaRaiseAutomationEvent(this, UIA_AutomationFocusChangedEventId);
+  }
+
   return S_OK;
 }
 
 // IRawElementProviderFragmentRoot
 
 HRESULT
 UIABridge::ElementProviderFromPoint(double x, double y, IRawElementProviderFragment ** retVal)
 {