diff --git a/public/views/includes/note.html b/public/views/includes/note.html
index ce0be26e4..8f984dd83 100644
--- a/public/views/includes/note.html
+++ b/public/views/includes/note.html
@@ -3,7 +3,7 @@
   <span ng-show="!comment" translate>Enter a new comment</span>
   <span ng-show="comment" translate>Edit comment</span>
 </label>
-<input type="text" ng-model="data.comment">
+<input type="text" ng-model="data.comment" autofocus>
 </div>
 <div class="small-6 columns">
   <button class="round outline dark-gray expand" ng-click="commentPopupClose()" translate>CANCEL</button>
diff --git a/public/views/modals/search.html b/public/views/modals/search.html
index 9fdb91128..747528921 100644
--- a/public/views/modals/search.html
+++ b/public/views/modals/search.html
@@ -31,14 +31,18 @@
           <img src="img/icon-moved.svg" alt="sync" width="40" ng-show="btx.action == 'moved'">
         </div>
         <div class="m10t">
-          <span ng-show="btx.action == 'received'" translate>Received</span>
-          <span ng-show="btx.action == 'sent'">
-            {{index.addressbook[btx.addressTo]}}
-            <span ng-show="!index.addressbook[btx.addressTo] && btx.message">
-              <span class="ellipsis">{{btx.message}}</span>
+          <span ng-show="btx.action == 'received'">
+            <span class="ellipsis">
+              <span ng-if="btx.note.body">{{btx.note.body}}</span>
+              <span ng-if="!btx.note.body" translate> Received</span>
             </span>
-            <span ng-show="!index.addressbook[btx.addressTo] && !btx.message">
-              <span translate> Sent</span>
+          </span>
+          <span ng-show="btx.action == 'sent'">
+            <span class="ellipsis">
+              <span ng-if="btx.message">{{btx.message}}</span>
+              <span ng-if="!btx.message && btx.note.body">{{btx.note.body}}</span>
+              <span ng-if="!btx.message && !btx.note.body && index.addressbook[btx.addressTo]">{{index.addressbook[btx.addressTo]}}</span>
+              <span ng-if="!btx.message && !btx.note.body && !index.addressbook[btx.addressTo]" translate> Sent</span>
             </span>
           </span>
           <span ng-show="btx.action == 'moved'" translate>Moved</span>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 1e8773198..f9a4d8eb2 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -913,8 +913,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         if (tx.addressTo && self.addressbook && self.addressbook[tx.addressTo]) addrbook = self.addressbook[tx.addressTo] || '';
         var searchableDate = computeSearchableDate(new Date(tx.time * 1000));
         var message = tx.message ? tx.message : '';
+        var comment = tx.note ? tx.note.body : '';
         var addressTo = tx.addressTo ? tx.addressTo : '';
-        return ((tx.amountStr + message + addressTo + addrbook + searchableDate).toString()).toLowerCase();
+        return ((tx.amountStr + message + addressTo + addrbook + searchableDate + comment).toString()).toLowerCase();
       }
 
       function computeSearchableDate(date) {
diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js
index 38dda5d08..e4df94c27 100644
--- a/src/js/controllers/modals/txDetails.js
+++ b/src/js/controllers/modals/txDetails.js
@@ -41,6 +41,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
         $scope.btx.note.body = $scope.data.comment;
         $scope.btx.note.editedByName = fc.credentials.copayerName;
         $scope.btx.note.editedOn = Math.floor(Date.now() / 1000);
+        $scope.btx.searcheableString = null;
         commentPopup.close();
       });
     };