diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index c5b55c7e0f..605f818ecc 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -367,11 +367,13 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
-                    <ImageView
-                        android:id="@+id/search_icon"
+                    <ImageButton
+                        android:id="@+id/search_back_button"
+                        style="@style/Widget.AppCompat.ActionButton"
                         android:layout_width="54dp"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_action_search_dark"/>
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/back_to_search"
+                        android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha"/>
 
                     <TextView
                         android:id="@+id/search_title"
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 15e8d03b67..1c32e93025 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -165,11 +165,13 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <ImageView
-                    android:id="@+id/search_icon"
+                <ImageButton
+                    android:id="@+id/search_back_button"
+                    style="@style/Widget.AppCompat.ActionButton"
                     android:layout_width="54dp"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_action_search_dark"/>
+                    android:layout_height="48dp"
+                    android:contentDescription="@string/back_to_search"
+                    android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha"/>
 
                 <TextView
                     android:id="@+id/search_title"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index b6c3dea7e7..0aa5e58205 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="back_to_search">Back to search</string>
     <string name="confirmation_to_delete_history_items">Do you want to delete selected history items?</string>
     <string name="show_something_on_map">Show %1$s on the map</string>
     <string name="release_2_4">
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index 0084d651f6..b59a9499d5 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -484,8 +484,11 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 
 	@Override
 	public void onDismiss(DialogInterface dialog) {
-		getMapActivity().setQuickSearchTopbarActive(false);
-		getChildFragmentManager().popBackStack();
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			getMapActivity().setQuickSearchTopbarActive(false);
+			getChildFragmentManager().popBackStack();
+		}
 		super.onDismiss(dialog);
 	}
 
@@ -570,7 +573,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 				break;
 
 			case MAIN:
-				if (!Algorithms.isEmpty(searchQuery)) {
+				if (!Algorithms.isEmpty(searchQuery) && !searchQuery.equals(searchEditText.getText().toString())) {
 					String txt = searchQuery;
 					searchQuery = "";
 					searchEditText.setText(txt);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index fe071ca9a4..8ae1f961fa 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -165,7 +165,7 @@ public class MapInfoWidgetsFactory {
 		private final MapActivity map;
 		private View searchTopBar;
 		private View searchTopBarLayout;
-		private ImageView searchIcon;
+		private ImageButton searchBackButton;
 		private TextView searchTitle;
 		private ImageButton searchCloseButton;
 
@@ -173,7 +173,13 @@ public class MapInfoWidgetsFactory {
 			this.map = map;
 			searchTopBar = map.findViewById(R.id.search_topbar);
 			searchTopBarLayout = map.findViewById(R.id.search_topbar_layout);
-			searchIcon = (ImageView) map.findViewById(R.id.search_icon);
+			searchBackButton = (ImageButton) map.findViewById(R.id.search_back_button);
+			searchBackButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					map.showQuickSearch();
+				}
+			});
 			searchTitle = (TextView) map.findViewById(R.id.search_title);
 			searchTitle.setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -222,7 +228,7 @@ public class MapInfoWidgetsFactory {
 		public void updateTextColor(boolean nightMode, int textColor) {
 			OsmandApplication app = map.getMyApplication();
 			searchTitle.setTextColor(textColor);
-			searchIcon.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_search_dark, !nightMode));
+			searchBackButton.setImageDrawable(app.getIconsCache().getIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha, !nightMode));
 			searchCloseButton.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_remove_dark, !nightMode));
 		}