diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 2a84207ec..0edc265dc 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -54,6 +54,9 @@ OSM.Query = function(map) {
       $(this).removeClass("selected");
     })
     .on("click", ".query-results li.query-result", function (e) {
+      var geometry = $(this).data("geometry")
+      if (geometry) map.removeLayer(geometry);
+
       if (!$(e.target).is('a')) {
         $(this).find("a").simulate("click", e);
       }