diff --git a/app/assets/javascripts/app/controllers/notes.js b/app/assets/javascripts/app/controllers/notes.js
index 1c33e0d1b..14c29bb99 100644
--- a/app/assets/javascripts/app/controllers/notes.js
+++ b/app/assets/javascripts/app/controllers/notes.js
@@ -34,6 +34,7 @@ angular.module('app')
   .controller('NotesCtrl', function (authManager, $timeout, $rootScope, modelManager, storageManager, desktopManager) {
 
     this.panelController = {};
+    this.searchEntered = false;
 
     $rootScope.$on("user-preferences-changed", () => {
       this.loadPreferences();
@@ -106,6 +107,10 @@ angular.module('app')
     this.DefaultNotesToDisplayValue = (document.documentElement.clientHeight / MinNoteHeight) || 20;
 
     this.paginate = function() {
+      if (this.searchEntered) {
+        desktopManager.searchText(this.noteFilter.text);
+      }
+
       this.notesToDisplay += this.DefaultNotesToDisplayValue
     }
 
@@ -262,6 +267,7 @@ angular.module('app')
     this.onFilterEnter = function() {
       // For Desktop, performing a search right away causes input to lose focus.
       // We wait until user explicity hits enter before highlighting desktop search results.
+      this.searchEntered = true;
       desktopManager.searchText(this.noteFilter.text);
     }
 
@@ -275,6 +281,10 @@ angular.module('app')
     }
 
     this.filterTextChanged = function() {
+      if (this.searchEntered) {
+        this.searchEntered = false;
+      }
+
       $timeout(function(){
         if(!this.selectedNote.visible) {
           this.selectFirstNote(false);