--- a/accessible/ipc/win/HandlerProvider.cpp
+++ b/accessible/ipc/win/HandlerProvider.cpp
@@ -309,16 +309,21 @@ HandlerProvider::BuildDynamicIA2Data(Dyn
     return;
   }
 
   hr = target->get_accDescription(kChildIdSelf, &aOutIA2Data->mDescription);
   if (FAILED(hr)) {
     return;
   }
 
+  hr = target->get_accDefaultAction(kChildIdSelf, &aOutIA2Data->mDefaultAction);
+  if (FAILED(hr)) {
+    return;
+  }
+
   hr = target->get_accChildCount(&aOutIA2Data->mChildCount);
   if (FAILED(hr)) {
     return;
   }
 
   hr = target->get_accValue(kChildIdSelf, &aOutIA2Data->mValue);
   if (FAILED(hr)) {
     return;

--- a/accessible/ipc/win/handler/AccessibleHandler.cpp
+++ b/accessible/ipc/win/handler/AccessibleHandler.cpp
@@ -1273,16 +1273,34 @@ AccessibleHandler::get_keyBinding(long a
   }
   return mIAHyperlinkPassThru->get_keyBinding(
     actionIndex, nMaxBindings, keyBindings, nBindings);
 }
 
 HRESULT
 AccessibleHandler::get_name(long actionIndex, BSTR* name)
 {
+  if (!name) {
+    return E_INVALIDARG;
+  }
+
+  if (HasPayload()) {
+    if (actionIndex >= mCachedData.mDynamicData.mNActions) {
+      // Action does not exist.
+      return E_INVALIDARG;
+    }
+
+    if (actionIndex == 0) {
+      // same as accDefaultAction.
+      GET_BSTR(mDefaultAction, *name);
+      return S_OK;
+    }
+  }
+
+  // At this point, there's either no payload or actionIndex is > 0.
   HRESULT hr = ResolveIAHyperlink();
   if (FAILED(hr)) {
     return hr;
   }
   return mIAHyperlinkPassThru->get_name(actionIndex, name);
 }
 
 HRESULT