diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index a29ec80c5..5a531c4db 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -157,7 +157,7 @@
             (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
             <span class="text-gray" translate>See it on the blockchain</span>
           </button>
-          <button class="button outline round dark-gray tiny" ng-click="showCommentPopup()">
+          <button class="button outline round dark-gray tiny" ng-click="showCommentPopup(comment)">
             <span class="text-gray" translate ng-show="!comment">Add a comment <i class="ion-ios-plus-outline"></i></span>
             <span class="text-gray" translate ng-show="comment">Edit comment <i class="ion-ios-compose-outline"></i></span>
           </button>
diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js
index af768b584..ba007c002 100644
--- a/src/js/controllers/modals/txDetails.js
+++ b/src/js/controllers/modals/txDetails.js
@@ -34,8 +34,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
 
     var commentPopup = $ionicPopup.show({
       templateUrl: "views/includes/note.html",
-      title: gettextCatalog.getString('Enter a new comment'),
-      subTitle: gettextCatalog.getString('Save an empty content to delete it'),
+      title: !$scope.comment ? gettextCatalog.getString('Enter a new comment') : gettextCatalog.getString('Edit comment'),
       scope: $scope,
     });