diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 2dbbdc404a..e74ba18845 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="show_something_on_map">Show %1$s on the map</string>
     <string name="release_2_4">
 	\u2022 New very powerful free text search. \n\n
 	\u2022 Much improved audio over Bluetooth.\n\n
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index 3ce8efc4ff..2ababdc93b 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -62,6 +62,7 @@ import net.osmand.search.core.SearchCoreFactory.SearchBaseAPI;
 import net.osmand.search.core.SearchPhrase;
 import net.osmand.search.core.SearchResult;
 import net.osmand.search.core.SearchSettings;
+import net.osmand.search.core.SearchWord;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
@@ -260,6 +261,12 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 					String newText = searchUICore.getPhrase().getTextWithoutLastWord();
 					searchEditText.setText(newText);
 					searchEditText.setSelection(newText.length());
+					SearchWord word = searchUICore.getPhrase().getLastSelectedWord();
+					if (word != null && word.getResult() != null) {
+						buttonToolbarText.setText(app.getString(R.string.show_something_on_map, word.getResult().localeName).toUpperCase());
+					} else {
+						buttonToolbarText.setText(app.getString(R.string.show_on_map).toUpperCase());
+					}
 				}
 			}
 		});
@@ -659,6 +666,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 		searchQuery = txt;
 		searchEditText.setText(txt);
 		searchEditText.setSelection(txt.length());
+		buttonToolbarText.setText(getMyApplication().getString(R.string.show_something_on_map, sr.localeName).toUpperCase());
 		runCoreSearch(txt);
 	}