diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 768fc77df249a9327402003e5dbfb99e67e759d7..3e61e50f75d5f9aed1733e4e6a2fc861eae5c82c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1713,6 +1713,9 @@
 			if (OCA.Search.files) {
 				OCA.Search.files.setFileList(this);
 			}
+			if (OC.Search) {
+				OC.Search.clear();
+			}
 		},
 		/**
 		 * Update UI based on the current selection
diff --git a/search/js/search.js b/search/js/search.js
index 58778900a694ee733c869a5ff194470238d4a39f..c595ae25092db8fd82019d88afb74b7201625e8c 100644
--- a/search/js/search.js
+++ b/search/js/search.js
@@ -229,6 +229,14 @@
 				$searchResults.find('tr.result').remove();
 				lastQuery = false;
 			};
+			this.clear = function() {
+				self.hideResults();
+				if(self.hasFilter(getCurrentApp())) {
+					self.getFilter(getCurrentApp())('');
+				}
+				$searchBox.val('');
+				$searchBox.blur();
+			};
 
 			/**
 			 * Event handler for when scrolling the list container.