diff --git a/gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744-2.html b/gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744-2.html
index 2fd6c93430e3..c2485367e811 100644
--- a/gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744-2.html
+++ b/gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744-2.html
@@ -33,17 +33,16 @@
   <input type="text" id="name" />
 </div>
 <script>
-const isAndroid = getPlatform() == "android";
 async function test() {
   is(window.scrollY, 0, "The initial scroll offset should be 0");
   is(visualViewport.scale, 1.0, "The document should not get scaled");
   is(visualViewport.pageTop, 0, "The initial visual viewport pageTop should be 0");
 
   visualViewport.addEventListener("scroll", () => {
-    ok(isAndroid, "Any VisualViewport scroll event should not be observed");
+    ok(false, "Any VisualViewport scroll event should not be observed");
   });
   window.addEventListener("scroll", () => {
-    ok(isAndroid, "Any scroll event should not be observed");
+    ok(false, "Any scroll event should not be observed");
   });
 
   // Scroll to the input element inside a position:fixed element.
@@ -55,13 +54,8 @@ async function test() {
   await promiseFrame();
   await promiseFrame();
 
-  if (isAndroid) {
-    todo_is(visualViewport.pageTop, 0, "The visual viewport pageTop should be zero");
-    todo_is(window.scrollY, 0, "The scroll offset should be zero");
-  } else {
-    is(visualViewport.pageTop, 0, "The visual viewport pageTop should be zero");
-    is(window.scrollY, 0, "The scroll offset should be zero");
-  }
+  is(visualViewport.pageTop, 0, "The visual viewport pageTop should be zero");
+  is(window.scrollY, 0, "The scroll offset should be zero");
 }
 
 waitUntilApzStable()
diff --git a/gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744.html b/gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744.html
index 59d1b7d8dc0a..10815c3d18bf 100644
--- a/gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744.html
+++ b/gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744.html
@@ -30,7 +30,6 @@
   <div id="target"></div>
 </div>
 <script>
-const isAndroid = getPlatform() == "android";
 async function test() {
   is(window.scrollY, 0, "The initial scroll offset should be 0");
   is(visualViewport.scale, 1.0, "The document should not get scaled");
@@ -43,10 +42,10 @@ async function test() {
   await scrollendPromise;
 
   visualViewport.addEventListener("scroll", () => {
-    ok(isAndroid, "Any VisualViewport scroll event should not be observed");
+    ok(false, "Any VisualViewport scroll event should not be observed");
   });
   window.addEventListener("scroll", () => {
-    ok(isAndroid, "Any scroll event should not be observed");
+    ok(false, "Any scroll event should not be observed");
   });
 
   document.querySelector("#target").scrollIntoView();
@@ -57,11 +56,7 @@ async function test() {
   await promiseFrame();
   await promiseFrame();
 
-  if (isAndroid) {
-    todo_is(window.scrollY, 2000, "The scroll offset should stay at 2000px");
-  } else {
-    is(window.scrollY, 2000, "The scroll offset should stay at 2000px");
-  }
+  is(window.scrollY, 2000, "The scroll offset should stay at 2000px");
 }
 
 waitUntilApzStable()
diff --git a/gfx/layers/apz/test/mochitest/test_group_scrollIntoView.html b/gfx/layers/apz/test/mochitest/test_group_scrollIntoView.html
index 2d73799a94d0..1c136f14ca80 100644
--- a/gfx/layers/apz/test/mochitest/test_group_scrollIntoView.html
+++ b/gfx/layers/apz/test/mochitest/test_group_scrollIntoView.html
@@ -15,8 +15,22 @@ var subtests = [
    "prefs": [...prefs,
              ["layout.scroll_fixed_content_into_view_visually", true]]
   },
-  {"file": "helper_scrollIntoView_bug1950744.html", prefs},
-  {"file": "helper_scrollIntoView_bug1950744-2.html", prefs},
+  {"file": "helper_scrollIntoView_bug1950744.html",
+   "prefs": [...prefs,
+             ["layout.scroll_fixed_content_into_view_visually", false]]
+  },
+  {"file": "helper_scrollIntoView_bug1950744.html",
+   "prefs": [...prefs,
+             ["layout.scroll_fixed_content_into_view_visually", true]]
+  },
+  {"file": "helper_scrollIntoView_bug1950744-2.html",
+   "prefs": [...prefs,
+             ["layout.scroll_fixed_content_into_view_visually", false]]
+  },
+  {"file": "helper_scrollIntoView_bug1950744-2.html",
+   "prefs": [...prefs,
+             ["layout.scroll_fixed_content_into_view_visually", true]]
+  },
 ];
 
 if (isApzEnabled()) {
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
index baa192c02e30..40aef5a93a07 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -3856,18 +3856,31 @@ void PresShell::ScrollFrameIntoVisualViewport(Maybe<nsPoint>& aDestination,
 
     const nsSize visualViewportSize =
         rootScrollContainer->GetVisualViewportSize();
+
+    const nsSize layoutViewportSize = root->GetLayoutViewportSize();
+    const nsRect layoutViewport = nsRect(nsPoint(), layoutViewportSize);
+    // `positon:fixed` element are attached/fixed to the ViewportFrame, which is
+    // the parent of the root scroll container frame, thus what we need here is
+    // the visible area of the position:fixed element inside the root scroll
+    // container frame.
+    // For example, if the top left position of the fixed element is (-100,
+    // -100), it's outside of the scrollable range either in the layout viewport
+    // or the visual viewport. Likewise, if the right bottom position of the
+    // fixed element is (110vw, 110vh), it's also outside of the scrollable
+    // range.
+    const nsRect clampedPositionFixedRect =
+        aPositionFixedRect.MoveInsideAndClamp(layoutViewport);
     // If the position:fixed element is already inside the visual viewport, we
     // don't need to scroll visually.
-    if (aPositionFixedRect.y >= 0 &&
-        aPositionFixedRect.YMost() <= visualViewportSize.height &&
-        aPositionFixedRect.x >= 0 &&
-        aPositionFixedRect.XMost() <= visualViewportSize.width) {
+    if (clampedPositionFixedRect.y >= 0 &&
+        clampedPositionFixedRect.YMost() <= visualViewportSize.height &&
+        clampedPositionFixedRect.x >= 0 &&
+        clampedPositionFixedRect.XMost() <= visualViewportSize.width) {
       return;
     }
 
     // If the position:fixed element is totally outside of the the layout
     // viewport, it will never be in the viewport.
-    const nsSize layoutViewportSize = root->GetLayoutViewportSize();
     if (!NeedToVisuallyScroll(layoutViewportSize, aPositionFixedRect)) {
       return;
     }