diff --git a/accessible/base/ARIAMap.cpp b/accessible/base/ARIAMap.cpp
index 20fccdcea811..b67391641619 100644
--- a/accessible/base/ARIAMap.cpp
+++ b/accessible/base/ARIAMap.cpp
@@ -1158,7 +1158,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] = {
   },
   { // searchbox
     nsGkAtoms::searchbox,
-    roles::ENTRY,
+    roles::SEARCHBOX,
     kUseMapRole,
     eNoValue,
     eActivateAction,
diff --git a/accessible/base/RoleMap.h b/accessible/base/RoleMap.h
index 5aee57169b4f..f3b0847d862f 100644
--- a/accessible/base/RoleMap.h
+++ b/accessible/base/RoleMap.h
@@ -660,7 +660,7 @@ ROLE(PASSWORD_TEXT,
      nullptr,
      ATK_ROLE_PASSWORD_TEXT,
      NSAccessibilityTextFieldRole,
-     NSAccessibilityUnknownSubrole,
+     NSAccessibilitySecureTextFieldSubrole,
      ROLE_SYSTEM_TEXT,
      ROLE_SYSTEM_TEXT,
      java::SessionAccessibility::CLASSNAME_EDITTEXT,
diff --git a/accessible/basetypes/Accessible.cpp b/accessible/basetypes/Accessible.cpp
index 917ef102bc4a..2f7763f90ce2 100644
--- a/accessible/basetypes/Accessible.cpp
+++ b/accessible/basetypes/Accessible.cpp
@@ -451,16 +451,6 @@ already_AddRefed<nsIURI> Accessible::AnchorURIAt(uint32_t aAnchorIndex) const {
   return nullptr;
 }
 
-bool Accessible::IsSearchbox() const {
-  const nsRoleMapEntry* roleMapEntry = ARIARoleMap();
-  if (roleMapEntry && roleMapEntry->Is(nsGkAtoms::searchbox)) {
-    return true;
-  }
-
-  RefPtr<nsAtom> inputType = InputType();
-  return inputType == nsGkAtoms::search;
-}
-
 #ifdef A11Y_LOG
 void Accessible::DebugDescription(nsCString& aDesc) const {
   aDesc.Truncate();
@@ -632,9 +622,6 @@ nsStaticAtom* Accessible::ComputedARIARole() const {
     // map to a unique Gecko role.
     return roleMap->roleAtom;
   }
-  if (IsSearchbox()) {
-    return nsGkAtoms::searchbox;
-  }
   role geckoRole = Role();
   if (geckoRole == roles::LANDMARK) {
     // Landmark role from native markup; e.g. <main>, <nav>.
diff --git a/accessible/basetypes/Accessible.h b/accessible/basetypes/Accessible.h
index b576b9f0d391..d77de2eadb88 100644
--- a/accessible/basetypes/Accessible.h
+++ b/accessible/basetypes/Accessible.h
@@ -646,8 +646,6 @@ class Accessible {
 
   bool IsDateTimeField() const { return mType == eHTMLDateTimeFieldType; }
 
-  bool IsSearchbox() const;
-
   virtual bool HasNumericValue() const = 0;
 
   /**
diff --git a/accessible/html/HTMLFormControlAccessible.cpp b/accessible/html/HTMLFormControlAccessible.cpp
index 63ec089e3142..fdc9bfa8060f 100644
--- a/accessible/html/HTMLFormControlAccessible.cpp
+++ b/accessible/html/HTMLFormControlAccessible.cpp
@@ -289,9 +289,16 @@ role HTMLTextFieldAccessible::NativeRole() const {
   if (mType == eHTMLTextPasswordFieldType) {
     return roles::PASSWORD_TEXT;
   }
-  if (mContent->AsElement()->HasAttr(nsGkAtoms::list_)) {
+  dom::Element* el = mContent->AsElement();
+  if (el->HasAttr(nsGkAtoms::list_)) {
     return roles::EDITCOMBOBOX;
   }
+  if (const nsAttrValue* attr = el->GetParsedAttr(nsGkAtoms::type)) {
+    RefPtr<nsAtom> inputType = attr->GetAsAtom();
+    if (inputType == nsGkAtoms::search) {
+      return roles::SEARCHBOX;
+    }
+  }
   return roles::ENTRY;
 }
 
diff --git a/accessible/ios/MUIAccessible.mm b/accessible/ios/MUIAccessible.mm
index d72ed77172a3..26169298c7d3 100644
--- a/accessible/ios/MUIAccessible.mm
+++ b/accessible/ios/MUIAccessible.mm
@@ -374,6 +374,9 @@ static uint64_t GetAccessibilityTraits(Accessible* aAccessible) {
     case roles::PASSWORD_TEXT:
       traits |= Trait::SecureTextField;
       break;
+    case roles::SEARCHBOX:
+      traits |= Trait::SearchField;
+      break;
     default:
       break;
   }
@@ -405,10 +408,6 @@ static uint64_t GetAccessibilityTraits(Accessible* aAccessible) {
       traits |= Trait::IsEditing | Trait::TextOperationsAvailable;
     }
 
-    if (aAccessible->IsSearchbox()) {
-      traits |= Trait::SearchField;
-    }
-
     if (state & states::MULTI_LINE) {
       traits |= Trait::TextArea;
     }
diff --git a/accessible/mac/mozTextAccessible.h b/accessible/mac/mozTextAccessible.h
index b242a2da3278..45ecbe85fdaf 100644
--- a/accessible/mac/mozTextAccessible.h
+++ b/accessible/mac/mozTextAccessible.h
@@ -27,9 +27,6 @@
 // override
 - (NSString*)moxRole;
 
-// override
-- (NSString*)moxSubrole;
-
 // override
 - (NSNumber*)moxNumberOfCharacters;
 
diff --git a/accessible/mac/mozTextAccessible.mm b/accessible/mac/mozTextAccessible.mm
index d023870d5e77..fe412710a883 100644
--- a/accessible/mac/mozTextAccessible.mm
+++ b/accessible/mac/mozTextAccessible.mm
@@ -113,20 +113,6 @@ inline NSString* ToNSString(id aValue) {
   return [super moxRole];
 }
 
-- (NSString*)moxSubrole {
-  MOZ_ASSERT(mGeckoAccessible);
-
-  if (mRole == roles::PASSWORD_TEXT) {
-    return NSAccessibilitySecureTextFieldSubrole;
-  }
-
-  if (mRole == roles::ENTRY && mGeckoAccessible->IsSearchbox()) {
-    return @"AXSearchField";
-  }
-
-  return nil;
-}
-
 - (NSNumber*)moxNumberOfCharacters {
   return @([self textLength]);
 }
diff --git a/accessible/tests/browser/role/browser_computedARIARole.js b/accessible/tests/browser/role/browser_computedARIARole.js
index a87d0a0eae4a..6cc5e44aae34 100644
--- a/accessible/tests/browser/role/browser_computedARIARole.js
+++ b/accessible/tests/browser/role/browser_computedARIARole.js
@@ -55,8 +55,7 @@ addAccessibleTask(
     testComputedARIARole("ariaUnnamedRegion", "navigation");
     // The directory ARIA role is an alias of list.
     testComputedARIARole("ariaDirectory", "list");
-    // alertdialog, feed, rowgroup and searchbox map to a Gecko role, but it
-    // isn't unique.
+    // alertdialog, feed and rowgroupmap to a Gecko role, but it isn't unique.
     testComputedARIARole("ariaAlertdialog", "alertdialog");
     testComputedARIARole("ariaFeed", "feed");
     testComputedARIARole("ariaRowgroup", "rowgroup");
diff --git a/accessible/tests/browser/tree/browser_searchbar.js b/accessible/tests/browser/tree/browser_searchbar.js
index e44a82c86dc1..9b940f18ff06 100644
--- a/accessible/tests/browser/tree/browser_searchbar.js
+++ b/accessible/tests/browser/tree/browser_searchbar.js
@@ -33,7 +33,7 @@ add_task(async function test_searchbar_a11y_tree() {
 
       // input element
       {
-        role: ROLE_ENTRY,
+        role: ROLE_SEARCHBOX,
         children: [],
       },
 
@@ -72,7 +72,7 @@ add_task(async function test_searchbar_a11y_tree() {
 
       // input element
       {
-        role: ROLE_ENTRY,
+        role: ROLE_SEARCHBOX,
         children: [],
       },
 
diff --git a/accessible/tests/mochitest/elm/test_HTMLSpec.html b/accessible/tests/mochitest/elm/test_HTMLSpec.html
index 568a602efaf0..1333aa716605 100644
--- a/accessible/tests/mochitest/elm/test_HTMLSpec.html
+++ b/accessible/tests/mochitest/elm/test_HTMLSpec.html
@@ -765,11 +765,24 @@
         ],
       };
       testElm("input_email", obj);
-      testElm("input_search", obj);
       testElm("input_tel", obj);
       testElm("input_text", obj);
       testElm("input_url", obj);
 
+      // ////////////////////////////////////////////////////////////////////////
+      // HTML:input@type="search"
+
+      obj = {
+        role: ROLE_SEARCHBOX,
+        extraStates: EXT_STATE_EDITABLE | EXT_STATE_SINGLE_LINE,
+        actions: "activate",
+        interfaces: [ nsIAccessibleText, nsIAccessibleEditableText ],
+        children: [
+          { role: ROLE_TEXT_LEAF },
+        ],
+      };
+      testElm("input_search", obj);
+
       // ////////////////////////////////////////////////////////////////////////
       // input @type="text" with placeholder attribute
 
diff --git a/accessible/tests/mochitest/role/test_aria.html b/accessible/tests/mochitest/role/test_aria.html
index dcd2c7839e9f..7be1d3efdade 100644
--- a/accessible/tests/mochitest/role/test_aria.html
+++ b/accessible/tests/mochitest/role/test_aria.html
@@ -120,8 +120,8 @@
       testRole("aria_region_as_table_with_miscaption_mixed", ROLE_TABLE);
       testRole("aria_scrollbar", ROLE_SCROLLBAR);
       testRole("aria_scrollbar_mixed", ROLE_SCROLLBAR);
-      testRole("aria_searchbox", ROLE_ENTRY);
-      testRole("aria_searchbox_mixed", ROLE_ENTRY);
+      testRole("aria_searchbox", ROLE_SEARCHBOX);
+      testRole("aria_searchbox_mixed", ROLE_SEARCHBOX);
       testRole("aria_separator", ROLE_SEPARATOR);
       testRole("aria_separator_mixed", ROLE_SEPARATOR);
       testRole("aria_slider", ROLE_SLIDER);
@@ -481,8 +481,8 @@
   <table id="aria_region_as_table_with_miscaption_mixed" role="rEGIOn"><caption role="option">hello</caption></table>
   <span id="aria_scrollbar" role="scrollbar"></span>
   <span id="aria_scrollbar_mixed" role="sCROLLBAr"></span>
-  <span id="aria_searchbox" role="textbox"></span>
-  <span id="aria_searchbox_mixed" role="tEXTBOx"></span>
+  <span id="aria_searchbox" role="searchbox"></span>
+  <span id="aria_searchbox_mixed" role="sEARCHBOx"></span>
   <span id="aria_separator" role="separator"></span>
   <span id="aria_separator_mixed" role="sEPARATOr"></span>
   <span id="aria_slider" role="slider"></span>
diff --git a/testing/mochitest/tests/SimpleTest/AccessibilityUtils.js b/testing/mochitest/tests/SimpleTest/AccessibilityUtils.js
index 02dfe8195333..d1797e285a1e 100644
--- a/testing/mochitest/tests/SimpleTest/AccessibilityUtils.js
+++ b/testing/mochitest/tests/SimpleTest/AccessibilityUtils.js
@@ -35,6 +35,7 @@ this.AccessibilityUtils = (function () {
     Ci.nsIAccessibleRole.ROLE_PASSWORD_TEXT,
     Ci.nsIAccessibleRole.ROLE_PUSHBUTTON,
     Ci.nsIAccessibleRole.ROLE_RADIOBUTTON,
+    Ci.nsIAccessibleRole.ROLE_SEARCHBOX,
     Ci.nsIAccessibleRole.ROLE_SLIDER,
     Ci.nsIAccessibleRole.ROLE_SPINBUTTON,
     Ci.nsIAccessibleRole.ROLE_SUMMARY,