diff --git a/server/borders_api.py b/server/borders_api.py
index 79d2889..99d418f 100755
--- a/server/borders_api.py
+++ b/server/borders_api.py
@@ -172,6 +172,16 @@ def check_osm_table():
 		pass
 	return jsonify(osm=osm, tables=old, readonly=config.READONLY, backup=backup, crossing=crossing)
 
+@app.route('/search')
+def search():
+	query = request.args.get('q')
+	cur = g.conn.cursor()
+	cur.execute('select ST_XMin(geom), ST_YMin(geom), ST_XMax(geom), ST_YMax(geom) from borders where name like %s limit 1', ('%{0}%'.format(query),))
+	if cur.rowcount > 0:
+		rec = cur.fetchone()
+		return jsonify(bounds=[rec[0], rec[1], rec[2], rec[3]])
+	return jsonify(status='not found')
+
 @app.route('/split')
 def split():
 	if config.READONLY:
diff --git a/www/borders.js b/www/borders.js
index 856f8de..07839ed 100644
--- a/www/borders.js
+++ b/www/borders.js
@@ -328,6 +328,26 @@ function countRings( rings, polygon ) {
 	return rings;
 }
 
+function doSearch() {
+  var query = $('#fsearch').val();
+  if( query.length() > 1 ) {
+	$.ajax(getServer('search'), {
+		data: { 'q': query },
+		success: zoomToFound
+	});
+  }
+}
+
+function zoomToFound(result) {
+	$('#fsearch').val('');
+	if( !('bounds' in result))
+		return;
+	var b = result['bounds'];
+	if( b.size() != 4 )
+		return;
+	map.fitBounds([[b[0], b[1]], [b[2], b[3]]]);
+}
+
 function bUpdateColors() {
 	size_good = +$('#r_green').val();
 	if( size_good <= 0 )
diff --git a/www/index.html b/www/index.html
index 288daea..aaee5f4 100644
--- a/www/index.html
+++ b/www/index.html
@@ -20,7 +20,7 @@
 			#info { margin-top: 2em; }
 			#b_delete, #b_clear, .back_del { font-size: 8pt; }
 			#rename, #split, #join, #point, #divide, #backup, #fixcross { display: none; }
-			.actions input[type='text'] { width: 150px; }
+			.actions input[type='text'], .search input[type='text'] { width: 150px; }
 			#header { border-bottom: 1px solid gray; margin-bottom: 1em; padding-bottom: 1em; }
 			#f_topo, #f_chars, #f_comments, #links { font-size: 10pt; }
 			#backup_saving, #backup_restoring { margin-bottom: 1em; }
@@ -171,6 +171,9 @@
 				</div>
 				<button onclick="bFixCrossCancel()">Вернуться</button>
 			</div>
+			<div id="search">
+				Поиск <input type="text" id="fsearch"><button onclick="doSearch()">&#x1f50d;</button>
+			</div>
 		</div>
 		<div id="map"></div>
 	</body>