diff --git a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
index a074539a23..af82766d62 100644
--- a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
@@ -42,7 +42,7 @@ Darkswarm.directive 'mapSearch', ($timeout, Search) ->
 
     # When the map loads, and we have a search from ?query, perform that search
     scope.performUrlSearch = (map) ->
-      google.maps.event.addListener map, "tilesloaded", =>
+      google.maps.event.addListenerOnce map, "idle", =>
         google.maps.event.trigger(scope.input, 'focus');
         google.maps.event.trigger(scope.input, 'keydown', {keyCode: 13});