diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 58750d242..2a84207ec 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -22,9 +22,9 @@ OSM.Query = function(map) {
     if (queryButton.hasClass("disabled")) return;
 
     if (queryButton.hasClass("active")) {
-      disableQueryMode();
-
-      OSM.router.route("/");
+      if ($("#content").hasClass("overlay-sidebar")) {
+        disableQueryMode();
+      }
     } else {
       enableQueryMode();
     }