diff --git a/apps/files/js/search.js b/apps/files/js/search.js
index 5fb10ef34c..496c210232 100644
--- a/apps/files/js/search.js
+++ b/apps/files/js/search.js
@@ -34,7 +34,12 @@
 				return !!OCA.Files && !!OCA.Files.App;
 			};
 			function inFileList($row, result) {
-				return self.fileAppLoaded() && self.fileList.inList(result.name);
+				if (! self.fileAppLoaded()) {
+					return false;
+				}
+				var dir = self.fileList.getCurrentDirectory().replace(/\/+$/,'');
+				var resultDir = OC.dirname(result.path);
+				return dir === resultDir && self.fileList.inList(result.name);
 			}
 			function updateLegacyMimetype(result) {
 				// backward compatibility:
diff --git a/search/js/search.js b/search/js/search.js
index d1e25913e3..58778900a6 100644
--- a/search/js/search.js
+++ b/search/js/search.js
@@ -213,7 +213,7 @@
 				var result = $searchResults.find('tr.result')[currentResult];
 				if (result) {
 					var $result = $(result);
-					var currentOffset = $searchResults.scrollTop();
+					var currentOffset = $('#app-content').scrollTop();
 					$('#app-content').animate({
 						// Scrolling to the top of the new result
 						scrollTop: currentOffset + $result.offset().top - $result.height() * 2
@@ -235,7 +235,7 @@
 			 * This appends/renders the next page of entries when reaching the bottom.
 			 */
 			function onScroll(e) {
-				if ($searchResults) {
+				if ($searchResults && lastQuery !== false) {
 					var resultsBottom = $searchResults.offset().top + $searchResults.height();
 					var containerBottom = $searchResults.offsetParent().offset().top + $searchResults.offsetParent().height();
 					if ( resultsBottom < containerBottom * 1.2 ) {