diff --git a/OsmAnd/res/layout/fragment_edit_poi_advanced.xml b/OsmAnd/res/layout/fragment_edit_poi_advanced.xml
index 140cd1ae6c..c9058224b2 100644
--- a/OsmAnd/res/layout/fragment_edit_poi_advanced.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi_advanced.xml
@@ -118,10 +118,5 @@
                 android:textSize="@dimen/default_sub_text_size"
                 osmand:typeface="@string/font_roboto_medium"/>
         </LinearLayout>
-        <!--XXX due to bug in NestedScroolView-->
-        <Space
-            android:id="@+id/screenFiller"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
     </FrameLayout>
 </android.support.v4.widget.NestedScrollView>
diff --git a/OsmAnd/res/layout/fragment_edit_poi_normal.xml b/OsmAnd/res/layout/fragment_edit_poi_normal.xml
index 54e34fa0ab..0cf3ae73fb 100644
--- a/OsmAnd/res/layout/fragment_edit_poi_normal.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi_normal.xml
@@ -124,12 +124,5 @@
             android:text="@string/add_opening_hours"
             android:textSize="@dimen/default_sub_text_size"
             osmand:typeface="@string/font_roboto_medium"/>
-
-        <!--XXX due to bug in NestedScrollView-->
-        <Space
-            android:id="@+id/screenFiller"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:visibility="visible"/>
     </RelativeLayout>
 </android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
index d36d5bbda1..aed11f6e6e 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
@@ -1,12 +1,10 @@
 package net.osmand.plus.osmedit;
 
-import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -58,12 +56,6 @@ public class AdvancedEditPoiFragment extends BaseOsmAndFragment
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		final View view = inflater.inflate(R.layout.fragment_edit_poi_advanced, container, false);
 
-		Display display = getActivity().getWindowManager().getDefaultDisplay();
-		Point size = new Point();
-		display.getSize(size);
-		int height = size.y;
-		view.findViewById(R.id.screenFiller).setMinimumHeight(height);
-
 		deleteDrawable = getPaintedContentIcon(R.drawable.ic_action_remove_dark,
 				getActivity().getResources().getColor(R.color.dash_search_icon_dark));
 		nameTextView = (TextView) view.findViewById(R.id.nameTextView);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/BasicEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/BasicEditPoiFragment.java
index f64989486f..e89b80225f 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/BasicEditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/BasicEditPoiFragment.java
@@ -1,7 +1,6 @@
 package net.osmand.plus.osmedit;
 
 import android.content.res.Resources;
-import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -9,7 +8,6 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.TypedValue;
-import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -50,12 +48,6 @@ public class BasicEditPoiFragment extends BaseOsmAndFragment
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.fragment_edit_poi_normal, container, false);
 
-		Display display = getActivity().getWindowManager().getDefaultDisplay();
-		Point size = new Point();
-		display.getSize(size);
-		int height = size.y;
-		view.findViewById(R.id.screenFiller).setMinimumHeight(height);
-
 		TypedValue typedValue = new TypedValue();
 		Resources.Theme theme = getActivity().getTheme();
 		theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);