diff --git a/www/js/search.js b/www/js/search.js
index 7df917209848bb85989cafea3877ca3a19488579..a1171723cc9f05b6053ff92ebaac51ab8c459cb4 100644
--- a/www/js/search.js
+++ b/www/js/search.js
@@ -82,6 +82,9 @@
 			};
 			Directory.prototype.cancelSearch = function() {
 				this._searchCanceled = true;
+				if (this._xhr) {
+					this._xhr.abort();
+				}
 			};
 			Directory.prototype.execute = function(q) {
 				var cacheData = this._cache.get(q),
@@ -92,7 +95,7 @@
 				if (cacheData) {
 					this._render(cacheData);
 				} else {
-					$.get(this._server + '/service.php?q=' + encodeURIComponent(q), function(data) {
+					this._xhr = $.get(this._server + '/service.php?q=' + encodeURIComponent(q), function(data) {
 						self._cache.save(q, data);
 						self._render(data);
 					});