diff --git a/e2e/safe-area/app/home/home-page.xml b/e2e/safe-area/app/home/home-page.xml
index 78da7cfcf..319617af7 100644
--- a/e2e/safe-area/app/home/home-page.xml
+++ b/e2e/safe-area/app/home/home-page.xml
@@ -4,12 +4,14 @@
         <Label class="action-bar-title" text="Home"></Label>
     </ActionBar>
 
-    <StackLayout>
-        <Button text="Component Examples" tap="onNavigate" route="component/component-page"></Button>
-        <Button text="GridLayout Examples" tap="onNavigate" route="gridlayout/gridlayout-page"></Button>
-        <Button text="ScrollView Examples" tap="onNavigate" route="scrollview/scrollview-page"></Button>
-        <Button text="ListView Examples" tap="onNavigate" route="listview/listview-page" />
-        <Button text="WrapLayout Examples" tap="onNavigate" route="wraplayout/wraplayout-page"></Button>
-        <Button text="Navigation" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-nav-page"></Button>
-    </StackLayout>
+    <ScrollView>
+        <StackLayout>
+            <Button text="Component Examples" tap="onNavigate" route="component/component-page"></Button>
+            <Button text="GridLayout Examples" tap="onNavigate" route="gridlayout/gridlayout-page"></Button>
+            <Button text="ScrollView Examples" tap="onNavigate" route="scrollview/scrollview-page"></Button>
+            <Button text="ListView Examples" tap="onNavigate" route="listview/listview-page" />
+            <Button text="WrapLayout Examples" tap="onNavigate" route="wraplayout/wraplayout-page"></Button>
+        </StackLayout>
+    </ScrollView>
+
 </Page>
diff --git a/e2e/safe-area/app/scrollview/action-bar/vscroll-hwrap-nav-page.xml b/e2e/safe-area/app/scrollview/action-bar/vscroll-hwrap-nav-page.xml
deleted file mode 100644
index b70af685e..000000000
--- a/e2e/safe-area/app/scrollview/action-bar/vscroll-hwrap-nav-page.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Page class="page"
-    xmlns="http://schemas.nativescript.org/tns.xsd">
-
-    <ScrollView orientation="vertical">
-        <WrapLayout orientation="horizontal">
-            <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="green"></Button>
-            <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
-            <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
-            <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
-        </WrapLayout>
-    </ScrollView>
-</Page>
diff --git a/e2e/safe-area/app/wraplayout/no-action-bar/hwrap-nav-page.ts b/e2e/safe-area/app/wraplayout/no-action-bar/hwrap-nav-page.ts
deleted file mode 100644
index 221f164c0..000000000
--- a/e2e/safe-area/app/wraplayout/no-action-bar/hwrap-nav-page.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { View, EventData } from "tns-core-modules/ui/core/view/view";
-import * as frame from "tns-core-modules/ui/frame";
-
-export function onNavigate(args: EventData) {
-    const view = args.object as View;
-    const route = view["route"];
-
-    // view.page.frame.navigate(route);
-    frame.topmost().navigate(route);
-}
diff --git a/e2e/safe-area/app/wraplayout/no-action-bar/hwrap-nav-page.xml b/e2e/safe-area/app/wraplayout/no-action-bar/hwrap-nav-page.xml
deleted file mode 100644
index 440b11b9f..000000000
--- a/e2e/safe-area/app/wraplayout/no-action-bar/hwrap-nav-page.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd"
-    xmlns:fragments="wraplayout/fragments" actionBarHidden="true">
-
-    <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="Green" tap="onNavigate" route="scrollview/action-bar/vscroll-hwrap-nav-page"></Button>
-        <Button text="H" backgroundColor="Pink"></Button>
-    </WrapLayout>
-
-</Page>
diff --git a/tns-core-modules/ui/scroll-view/scroll-view.ios.ts b/tns-core-modules/ui/scroll-view/scroll-view.ios.ts
index dc52c9ff1..58d1a6c5d 100644
--- a/tns-core-modules/ui/scroll-view/scroll-view.ios.ts
+++ b/tns-core-modules/ui/scroll-view/scroll-view.ios.ts
@@ -186,7 +186,7 @@ export class ScrollView extends ScrollViewBase {
         }
 
         nativeView.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(width), layout.toDeviceIndependentPixels(height));
-        View.layoutChild(this, this.layoutView, 0, 0, width, height);
+        View.layoutChild(this, this.layoutView, insets.left, insets.top, width, height);
 
         // if (this.orientation === "horizontal") {
         //     nativeView.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(this._contentMeasuredWidth + insets.left + insets.right), layout.toDeviceIndependentPixels(height));