diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 69781257af0c..b5e2b5ba285b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2020-12-16  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Update list heuristics to include linked lists inside navigation containers
+        https://bugs.webkit.org/show_bug.cgi?id=193382
+        <rdar://problem/47233475>
+
+        Reviewed by Zalan Bujtas.
+
+        * accessibility/list-detection2-expected.txt:
+        * accessibility/list-detection2.html:
+
 2020-12-16  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][BFC] Non-quantitative values such as auto and min-content are not influenced by the box-sizing property
diff --git a/LayoutTests/accessibility/list-detection2-expected.txt b/LayoutTests/accessibility/list-detection2-expected.txt
index 9ae4ddadb3a3..d98683d5d167 100644
--- a/LayoutTests/accessibility/list-detection2-expected.txt
+++ b/LayoutTests/accessibility/list-detection2-expected.txt
@@ -17,6 +17,8 @@ PASS: ul w/ bullet content on ::before -> list.
 PASS: ul w/ bullet content on inline ::before -> list.
 PASS: ol w/ counter content on ::before -> list.
 PASS: ol w/ counter content on inline ::before -> list.
+PASS: ul list in a navigation role -> list.
+PASS: ol list in a nav element -> list.
 PASS: ul w/ background image (NOT A LIST) -> .
 PASS: ul w/ background on ::before (NOT A LIST) -> .
 PASS: ul w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST) -> .
diff --git a/LayoutTests/accessibility/list-detection2.html b/LayoutTests/accessibility/list-detection2.html
index e910690fac38..98cbc477f07f 100644
--- a/LayoutTests/accessibility/list-detection2.html
+++ b/LayoutTests/accessibility/list-detection2.html
@@ -113,6 +113,24 @@ <h1>list because these list markers consist of CSS-generated content on ::before
         <li>bar</li>
         <li>baz</li>
     </ol>
+    <div role="navigation">
+       <div>
+          <ul data-role="list" class="ex nomarkers" style="list-style-type:none" data-note=" list in a navigation role">
+            <li>foo</li>
+            <li>bar</li>
+            <li>baz</li>
+          </ul>
+       </div>
+    </div>
+    <nav>
+       <div>
+          <ol data-role="list" class="ex nomarkers" style="list-style-type:none" data-note=" list in a nav element">
+            <li>foo</li>
+            <li>bar</li>
+            <li>baz</li>
+          </ol>
+       </div>
+    </nav>
 
     <p>Since many web pages suffer from "list-itis" and some users have noted that they don't want to hear about so many lists, any UL or OL that does not match one of the above heuristics should not be exposed as a list. Chances are that they are just presentational lists using the elements for the sake of a styling hook.</p>
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f32028f73e45..3d3fd4695d09 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2020-12-16  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Update list heuristics to include linked lists inside navigation containers
+        https://bugs.webkit.org/show_bug.cgi?id=193382
+        <rdar://problem/47233475>
+
+        Reviewed by Zalan Bujtas.
+
+        If an unstyled list is inside a <nav> or a role=navigation, it should be marked
+        as an accessibility list.
+
+        Updated test: accessibility/list-detection2.html
+
+        * accessibility/AccessibilityList.cpp:
+        (WebCore::AccessibilityList::determineAccessibilityRole):
+
 2020-12-16  Simon Fraser  <simon.fraser@apple.com>
 
         Make FrameView::m_customSizeForResizeEvent an Optional<IntSize>
diff --git a/Source/WebCore/accessibility/AccessibilityList.cpp b/Source/WebCore/accessibility/AccessibilityList.cpp
index 0bd0a733acf8..cea4d34063d7 100644
--- a/Source/WebCore/accessibility/AccessibilityList.cpp
+++ b/Source/WebCore/accessibility/AccessibilityList.cpp
@@ -179,14 +179,19 @@ AccessibilityRole AccessibilityList::determineAccessibilityRole()
             }
         }
     }
-    
+
     // Non <ul> lists and ARIA lists only need to have one child.
     // <ul>, <ol> lists need to have visible markers.
     if (ariaRoleAttribute() != AccessibilityRole::Unknown) {
         if (!listItemCount)
             role = AccessibilityRole::ApplicationGroup;
-    } else if (!hasVisibleMarkers)
-        role = AccessibilityRole::Group;
+    } else if (!hasVisibleMarkers) {
+        // http://webkit.org/b/193382 lists inside of navigation hierarchies should still be considered lists.
+        if (Accessibility::findAncestor<AXCoreObject>(*this, false, [] (auto& object) { return object.roleValue() == AccessibilityRole::LandmarkNavigation; }))
+            role = AccessibilityRole::List;
+        else
+            role = AccessibilityRole::Group;
+    }
 
     return role;
 }