diff --git a/js/directive/search.js b/js/directive/search.js
index 5562434bc..5478e0204 100644
--- a/js/directive/search.js
+++ b/js/directive/search.js
@@ -4,20 +4,20 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *  
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 import app from '../app/App.js';
 
@@ -30,22 +30,32 @@ app.directive('search', function ($document, $location) {
 			'onSearch': '='
 		},
 		link: function (scope) {
-			var box = $('#searchbox');
-			box.val($location.search().search);
-
-			var doSearch = function() {
-				var value = box.val();
-				scope.$apply(function () {
-					scope.onSearch(value);
+			if (OCA.Search && OCA.Search.Core) {
+				// eslint-disable-next-line no-unused-vars
+				const search = new OCA.Search((term) => {
+					scope.$apply(function () {
+						scope.onSearch(term);
+					});
+				}, () => {
+					scope.$apply(function () {
+						scope.onSearch('');
+					});
 				});
-			};
+			} else {
+				const box = $('#searchbox');
+				box.val($location.search().search);
 
-			box.on('search keyup', function (event) {
-				if (event.type === 'search' || event.keyCode === 13 ) {
+				var doSearch = function () {
+					var value = box.val();
+					scope.$apply(function () {
+						scope.onSearch(value);
+					});
+				};
+
+				box.on('search keyup', function (event) {
 					doSearch();
-				}
-			});
-
+				});
+			}
 		}
 	};
 });