diff --git a/app/js/controllers.js b/app/js/controllers.js
index 309138c0..8b370af8 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -355,6 +355,9 @@ angular.module('myApp.controllers', [])
 
     var prevMessages = false;
     $scope.$watchCollection('search', function () {
+      if ($scope.search.messages && (!angular.isString($scope.search.query) || !$scope.search.query.length)) {
+        prevMessages = $scope.search.messages = false;
+      }
       if ($scope.search.messages != prevMessages) {
         prevMessages = $scope.search.messages;
         $scope.dialogs = [];