diff --git a/OsmAnd/res/layout/fragment_import.xml b/OsmAnd/res/layout/fragment_import.xml
index b8fba79615..8a469f97d0 100644
--- a/OsmAnd/res/layout/fragment_import.xml
+++ b/OsmAnd/res/layout/fragment_import.xml
@@ -16,7 +16,6 @@
 		android:focusable="false"
 		android:groupIndicator="@android:color/transparent"
 		android:listSelector="@android:color/transparent"
-		android:paddingBottom="@dimen/dialog_button_ex_height"
 		osmand:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 	<LinearLayout
diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
index a5f4b0b0d1..6c4e22caaf 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
@@ -127,6 +127,15 @@ public class ImportSettingsFragment extends BaseOsmAndFragment
 		if (Build.VERSION.SDK_INT >= 21) {
 			AndroidUtils.addStatusBarPadding21v(app, root);
 		}
+		final int buttonsHeight = app.getResources().getDimensionPixelSize(R.dimen.dialog_button_ex_height);
+		expandableList.setPadding(0, 0, 0, buttonsHeight * 2);
+		expandableList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+			@Override
+			public boolean onGroupClick(ExpandableListView expandableListView, View view, int i, long l) {
+				expandableList.setPadding(0, 0, 0, buttonsHeight);
+				return false;
+			}
+		});
 		return root;
 	}