diff --git a/e2e/safe-area/app/home/home-page.xml b/e2e/safe-area/app/home/home-page.xml
index 4fed008ed..9d7247209 100644
--- a/e2e/safe-area/app/home/home-page.xml
+++ b/e2e/safe-area/app/home/home-page.xml
@@ -8,5 +8,6 @@
         <Button text="GridLayout Examples" tap="onNavigate" route="gridlayout/gridlayout-page"></Button>
         <Button text="ScrollView Examples" tap="onNavigate" route="scrollview/scrollview-page"></Button>
         <Button text="Component Examples" tap="onNavigate" route="component/component-page"></Button>
+        <Button text="WrapLayout Examples" tap="onNavigate" route="wraplayout/wraplayout-page"></Button>
     </StackLayout>
 </Page>
diff --git a/e2e/safe-area/app/wraplayout/action-bar/wraplayout-page.xml b/e2e/safe-area/app/wraplayout/action-bar/wraplayout-page.xml
new file mode 100644
index 000000000..0bc64ddd0
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/action-bar/wraplayout-page.xml
@@ -0,0 +1,10 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" 
+    xmlns:fragments="wraplayout/fragments">
+
+    <ActionBar>
+        <Label text="Action Bar"></Label>
+    </ActionBar>
+
+    <fragments:hwrap-fragment></fragments:hwrap-fragment>
+
+</Page>
diff --git a/e2e/safe-area/app/wraplayout/fragments/hwrap-fragment.xml b/e2e/safe-area/app/wraplayout/fragments/hwrap-fragment.xml
new file mode 100644
index 000000000..cb3ea16e2
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/fragments/hwrap-fragment.xml
@@ -0,0 +1,6 @@
+<WrapLayout orientation="horizontal" backgroundColor="LightGreen">
+    <Label text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" height="100%" backgroundColor="LightPink"></Label>
+    <Label text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Label>
+    <!-- <Label text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Label> -->
+    <!-- <Label text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightCyan"></Label> -->
+</WrapLayout>
diff --git a/e2e/safe-area/app/wraplayout/no-action-bar/wraplayout-page.xml b/e2e/safe-area/app/wraplayout/no-action-bar/wraplayout-page.xml
new file mode 100644
index 000000000..468532ab0
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/no-action-bar/wraplayout-page.xml
@@ -0,0 +1,6 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" 
+    xmlns:fragments="wraplayout/fragments" actionBarHidden="true">
+
+    <fragments:hwrap-fragment></fragments:hwrap-fragment>
+
+</Page>
diff --git a/e2e/safe-area/app/wraplayout/wraplayout-page.ts b/e2e/safe-area/app/wraplayout/wraplayout-page.ts
new file mode 100644
index 000000000..c651c4d84
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/wraplayout-page.ts
@@ -0,0 +1,8 @@
+import { View, EventData } from "tns-core-modules/ui/core/view/view";
+
+export function onNavigate(args: EventData) {
+    const view = args.object as View;
+    const route = view["route"];
+
+    view.page.frame.navigate(route);
+}
diff --git a/e2e/safe-area/app/wraplayout/wraplayout-page.xml b/e2e/safe-area/app/wraplayout/wraplayout-page.xml
new file mode 100644
index 000000000..155d3c3b3
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/wraplayout-page.xml
@@ -0,0 +1,18 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd">
+
+    <ActionBar>
+        <Label text="WrapLayout Examples"></Label>
+    </ActionBar>
+
+    <StackLayout horizontalAlignment="center">
+        <StackLayout>
+            <Label text="Pages w/ ActionBar"></Label>
+            <Button text="HWrap" tap="onNavigate" route="wraplayout/action-bar/wraplayout-page"></Button>
+        </StackLayout>
+        <StackLayout>
+            <Label text="Pages w/o ActionBar"></Label>
+            <Button text="HWrap" tap="onNavigate" route="wraplayout/no-action-bar/wraplayout-page"></Button>
+        </StackLayout>
+    </StackLayout>
+
+</Page>