diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 936cc1e0e9..486c9b36bb 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -30,6 +30,11 @@ function initializeSearch(map) {
     });
 
     openSidebar();
+
+    $("#sidebar").one("closed", function () {
+      map.removeLayer(marker);
+      map.removeObject();
+    });
   }
 
   function clickSearchResult(e) {
diff --git a/app/assets/javascripts/leaflet.extend.js.erb b/app/assets/javascripts/leaflet.extend.js.erb
index 8aa9c70ec8..0df6fd3812 100644
--- a/app/assets/javascripts/leaflet.extend.js.erb
+++ b/app/assets/javascripts/leaflet.extend.js.erb
@@ -146,6 +146,12 @@ L.extend(L.Map.prototype, {
         map._objectLayer.addTo(map);
       }
     });
+  },
+
+  removeObject: function() {
+    this._object = null;
+    if (this._objectLoader) this._objectLoader.abort();
+    if (this._objectLayer) this.removeLayer(this._objectLayer);
   }
 });