diff --git a/e2e/safe-area/app/scrollview/action-bar/hscroll-hwrap-page.xml b/e2e/safe-area/app/scrollview/action-bar/hscroll-hwrap-page.xml
new file mode 100644
index 000000000..58109ae66
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/action-bar/hscroll-hwrap-page.xml
@@ -0,0 +1,10 @@
+<Page class="page"
+    xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="scrollview/fragments">
+    
+    <ActionBar class="action-bar">
+        <Label class="action-bar-title" text="ScrollView Examples"></Label>
+    </ActionBar>
+
+    <fragments:hscroll-hwrap-fragment></fragments:hscroll-hwrap-fragment>
+</Page>
diff --git a/e2e/safe-area/app/scrollview/action-bar/vscroll-vwrap-page.xml b/e2e/safe-area/app/scrollview/action-bar/vscroll-vwrap-page.xml
new file mode 100644
index 000000000..a02f3b661
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/action-bar/vscroll-vwrap-page.xml
@@ -0,0 +1,10 @@
+<Page class="page"
+    xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="scrollview/fragments">
+    
+    <ActionBar class="action-bar">
+        <Label class="action-bar-title" text="ScrollView Examples"></Label>
+    </ActionBar>
+
+    <fragments:vscroll-vwrap-fragment></fragments:vscroll-vwrap-fragment>
+</Page>
diff --git a/e2e/safe-area/app/scrollview/fragments/hscroll-hwrap-fragment.xml b/e2e/safe-area/app/scrollview/fragments/hscroll-hwrap-fragment.xml
new file mode 100644
index 000000000..f1576162c
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/fragments/hscroll-hwrap-fragment.xml
@@ -0,0 +1,20 @@
+<ScrollView orientation="horizontal" backgroundColor="BurlyWood">
+    <WrapLayout orientation="horizontal" backgroundColor="LightGreen">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+    </WrapLayout>
+</ScrollView>
diff --git a/e2e/safe-area/app/scrollview/fragments/vscroll-vwrap-fragment.xml b/e2e/safe-area/app/scrollview/fragments/vscroll-vwrap-fragment.xml
new file mode 100644
index 000000000..487638764
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/fragments/vscroll-vwrap-fragment.xml
@@ -0,0 +1,20 @@
+<ScrollView backgroundColor="BurlyWood">
+    <WrapLayout orientation="vertical" backgroundColor="LightGreen">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightPink"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightBlue"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Button>
+    </WrapLayout>
+</ScrollView>
diff --git a/e2e/safe-area/app/scrollview/no-action-bar/hscroll-hwrap-page.xml b/e2e/safe-area/app/scrollview/no-action-bar/hscroll-hwrap-page.xml
new file mode 100644
index 000000000..9b60b49ae
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/no-action-bar/hscroll-hwrap-page.xml
@@ -0,0 +1,7 @@
+<Page class="page"
+    xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="scrollview/fragments"
+    actionBarHidden="true">
+
+    <fragments:hscroll-hwrap-fragment></fragments:hscroll-hwrap-fragment>
+</Page>
diff --git a/e2e/safe-area/app/scrollview/no-action-bar/vscroll-vwrap-page.xml b/e2e/safe-area/app/scrollview/no-action-bar/vscroll-vwrap-page.xml
new file mode 100644
index 000000000..b800faf6a
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/no-action-bar/vscroll-vwrap-page.xml
@@ -0,0 +1,7 @@
+<Page class="page"
+    xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="scrollview/fragments"
+    actionBarHidden="true">
+
+    <fragments:vscroll-vwrap-fragment></fragments:vscroll-vwrap-fragment>
+</Page>
diff --git a/e2e/safe-area/app/scrollview/scrollview-page.xml b/e2e/safe-area/app/scrollview/scrollview-page.xml
index b8871e5d8..6a1054003 100644
--- a/e2e/safe-area/app/scrollview/scrollview-page.xml
+++ b/e2e/safe-area/app/scrollview/scrollview-page.xml
@@ -7,17 +7,21 @@
     <StackLayout>
         <StackLayout>
             <Label text="Pages w/ ActionBar"></Label>
-            <Button text="VScroll VStack" tap="onNavigate" route="scrollview/action-bar/vscroll-vstack-page" />
             <Button text="HScroll HStack" tap="onNavigate" route="scrollview/action-bar/hscroll-hstack-page" />
-            <Button text="Grid 3x3 VScroll VStack" tap="onNavigate" route="scrollview/action-bar/grid-3x3-vscroll-vstack-page" />
+            <Button text="VScroll VStack" tap="onNavigate" route="scrollview/action-bar/vscroll-vstack-page" />
+            <Button text="HScroll HWrap" tap="onNavigate" route="scrollview/action-bar/hscroll-hwrap-page" />
+            <Button text="VScroll VWrap" tap="onNavigate" route="scrollview/action-bar/vscroll-vwrap-page" />
             <Button text="Grid 3x3 HScroll HStack" tap="onNavigate" route="scrollview/action-bar/grid-3x3-hscroll-hstack-page" />
+            <Button text="Grid 3x3 VScroll VStack" tap="onNavigate" route="scrollview/action-bar/grid-3x3-vscroll-vstack-page" />
         </StackLayout>
         <StackLayout>
             <Label text="Pages w/o ActionBar"></Label>
-            <Button text="VScroll VStack" tap="onNavigate" route="scrollview/no-action-bar/vscroll-vstack-page" />
             <Button text="HScroll HStack" tap="onNavigate" route="scrollview/no-action-bar/hscroll-hstack-page" />
-            <Button text="Grid 3x3 VScroll VStack" tap="onNavigate" route="scrollview/no-action-bar/grid-3x3-vscroll-vstack-page" />
+            <Button text="VScroll VStack" tap="onNavigate" route="scrollview/no-action-bar/vscroll-vstack-page" />
+            <Button text="HScroll HWrap" tap="onNavigate" route="scrollview/no-action-bar/hscroll-hwrap-page" />
+            <Button text="VScroll VWrap" tap="onNavigate" route="scrollview/no-action-bar/vscroll-vwrap-page" />
             <Button text="Grid 3x3 HScroll HStack" tap="onNavigate" route="scrollview/no-action-bar/grid-3x3-hscroll-hstack-page" />
+            <Button text="Grid 3x3 VScroll VStack" tap="onNavigate" route="scrollview/no-action-bar/grid-3x3-vscroll-vstack-page" />
         </StackLayout>
     </StackLayout>
 </Page>