diff --git a/www/scripts/controllers/note-controller.js b/www/scripts/controllers/note-controller.js
index b965235..ad0fb6e 100644
--- a/www/scripts/controllers/note-controller.js
+++ b/www/scripts/controllers/note-controller.js
@@ -305,11 +305,15 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind
     $scope.loading = true;
     var params = {
       page: $scope.currentPage,
-      pageSize: 35,
-      keyword: $scope.keyword,
-      tagId: tagId || $scope.currentTagId
+      pageSize: 35
     };
 
+    if (tagId || $scope.currentTagId) {
+      params.tagId = tagId || $scope.currentTagId;
+    } else if ($scope.keyword) {
+      params.keyword = $scope.keyword;
+    }
+
     let reply = await get("notes", params);
     $timeout(function () {
       let notes = reply.data;