diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
index 31e595e3714..4b1b3115c44 100644
--- a/zeppelin-web/src/components/navbar/navbar.controller.js
+++ b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -15,43 +15,6 @@
 'use strict';
 
 angular.module('zeppelinWebApp')
-.filter('notebookFilter', function() {
-  return function (notebooks, searchText)
-  {
-    if (!searchText) {
-      return notebooks;
-    }
-
-    var filteringNote = function(notebooks, filteredNotes) {
-      _.each(notebooks, function(notebook) {
-
-        if (notebook.name.toLowerCase().indexOf(searchText) !== -1) {
-          filteredNotes.push(notebook);
-          return notebook;
-        }
-
-        if (notebook.children) {
-          filteringNote(notebook.children, filteredNotes);
-        }
-      });
-    };
-
-    return _.filter(notebooks, function(notebook) {
-      if (notebook.children) {
-        var filteredNotes = [];
-        filteringNote(notebook.children, filteredNotes);
-
-        if (filteredNotes.length > 0) {
-          return filteredNotes;
-        }
-      }
-
-      if (notebook.name.toLowerCase().indexOf(searchText) !== -1) {
-        return notebook;
-      }
-    });
-  };
-})
 .controller('NavCtrl', function($scope, $rootScope, $http, $routeParams,
     $location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv, searchService) {
 
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index 9ba2cb14d95..cfe1559c6a3 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -44,8 +44,7 @@
             <li class="divider"></li>
             <div id="notebook-list" class="scrollbar-container">
               <li class="filter-names" ng-include="'components/filterNoteNames/filter-note-names.html'"></li>
-              <li ng-repeat="note in navbar.notes.root.children |notebookFilter:query track by $index"
-                  ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'notebook_list_renderer.html'"></li>
+              <li ng-repeat="note in navbar.notes.root.children | filter:query | orderBy:home.arrayOrderingSrv.notebookListOrdering track by $index" ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'notebook_list_renderer.html'"></li>
             </div>
           </ul>
         </li>