diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index 47907d2cbc..b9b3f0e2d8 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -19,7 +19,7 @@
         app:contentInsetLeft="72dp"
         app:contentInsetStart="72dp"/>
 
-    <android.support.design.widget.CoordinatorLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -39,8 +39,6 @@
                 <android.support.design.widget.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/shared_string_name"
-                    android:importantForAutofill="noExcludeDescendants"
                     android:layout_marginLeft="72dp"
                     android:layout_marginRight="16dp">
 
@@ -64,7 +62,6 @@
                 <!--android:layout_marginLeft="72dp"-->
                 <ImageButton
                     android:id="@+id/poiTypeButton"
-                    android:contentDescription="@string/poi_dialog_poi_type"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:layout_gravity="bottom"
@@ -114,14 +111,17 @@
                 app:tabTextColor="@android:color/darker_gray"/>
         </android.support.design.widget.AppBarLayout>
 
+        <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:fillViewport="true">
 
-        <android.support.v4.view.ViewPager
-            android:id="@+id/viewpager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-    </android.support.design.widget.CoordinatorLayout>
+            <android.support.v4.view.ViewPager
+                android:id="@+id/viewpager"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </ScrollView>
+    </LinearLayout>
 
     <View
         android:id="@+id/buttonDivider"