diff --git a/app/src/androidTest/java/com/alphawallet/app/AnalyticsSettingsTest.java b/app/src/androidTest/java/com/alphawallet/app/AnalyticsSettingsTest.java
index e27a2d8c7b..948deebdbf 100644
--- a/app/src/androidTest/java/com/alphawallet/app/AnalyticsSettingsTest.java
+++ b/app/src/androidTest/java/com/alphawallet/app/AnalyticsSettingsTest.java
@@ -9,6 +9,7 @@
 import static com.alphawallet.app.steps.Steps.closeSecurityWarning;
 import static com.alphawallet.app.steps.Steps.createNewWallet;
 import static com.alphawallet.app.steps.Steps.gotoSettingsPage;
+import static com.alphawallet.app.steps.Steps.scrollToImproved;
 import static com.alphawallet.app.steps.Steps.selectMenu;
 import static com.alphawallet.app.util.Helper.click;
 
@@ -38,7 +39,10 @@ public void title_should_see_crash_report_settings_page()
         gotoSettingsPage();
         selectMenu("Advanced");
         Helper.wait(1);
-        onView(withId(R.id.layout)).perform(swipeUp());
+        onView(withId(R.id.scroll_layer)).perform(swipeUp());
+        onView(withId(R.id.scroll_layer)).perform(swipeUp());
+        onView(withSubstring("Crash")).perform(scrollToImproved());
+
         click(withSubstring("Crash"));
         shouldSee("Share Anonymous Data");
     }
diff --git a/app/src/main/res/layout/activity_generic_settings.xml b/app/src/main/res/layout/activity_generic_settings.xml
index 26580f474d..365d0df248 100644
--- a/app/src/main/res/layout/activity_generic_settings.xml
+++ b/app/src/main/res/layout/activity_generic_settings.xml
@@ -1,16 +1,23 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
     <include layout="@layout/layout_simple_toolbar" />
 
     <View style="@style/Aw.Component.Separator" />
 
-    <LinearLayout
-        android:id="@+id/layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
+    <ScrollView
+            android:id="@+id/scroll_layer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <LinearLayout
+                android:id="@+id/layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+
+    </ScrollView>
 
 </LinearLayout>