diff --git a/public/views/confirm.html b/public/views/confirm.html
index 0f21a0ce2..d6669bbc3 100644
--- a/public/views/confirm.html
+++ b/public/views/confirm.html
@@ -61,9 +61,9 @@
         </div>
 
 
-        <div class="item item-icon-left item-icon-right" ng-click="showCommentPopup()">
-          <span ng-show="!comment">Add Description</span>
-          <span ng-show="comment">{{comment}}</span>
+        <div class="item item-icon-left item-icon-right" ng-click="showDescriptionPopup()">
+          <span ng-show="!description">Add Description</span>
+          <span ng-show="description">{{description}}</span>
           <i class="icon ion-ios-chatbubble-outline size-21"></i>
           <i class="icon ion-ios-plus-empty size-21"></i>
         </div>
diff --git a/public/views/includes/note.html b/public/views/includes/note.html
index ee7b59894..e52beba85 100644
--- a/public/views/includes/note.html
+++ b/public/views/includes/note.html
@@ -8,4 +8,4 @@
   <div class="col">
     <button class="button button-dark button-block" ng-click="commentPopupSave()" translate>Save</button>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 6eeb7756c..383a7ba56 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -17,18 +17,25 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     alertPopup.then(cb);
   };
 
-  $scope.showCommentPopup = function() {
+  $scope.showDescriptionPopup = function() {
     var commentPopup = $ionicPopup.show({
       templateUrl: "views/includes/note.html",
-      title: $scope.data.comment ? gettextCatalog.getString('Edit comment') : gettextCatalog.getString('Add comment'),
+      title: gettextCatalog.getString('Set description'),
       scope: $scope,
     });
     $scope.commentPopupClose = function() {
       commentPopup.close();
     };
     $scope.commentPopupSave = function() {
-      $log.debug('Saving comment');
-      $scope.comment = $scope.data.comment;
+      $log.debug('Saving description: ' + $scope.data.comment);
+      $scope.description = $scope.data.comment;
+      $scope.txp = null;
+
+      createTx($scope.wallet, $scope.toAddress, $scope.toAmount, $scope.data.comment, function(err, txp) {
+        if (err) return;
+        cachedTxp[$scope.wallet.id] = txp;
+        apply(txp);
+      });
       commentPopup.close();
     };
   };
@@ -83,17 +90,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
         stop = null;
       }
 
-      function apply(txp) {
-        $scope.fee = txFormatService.formatAmountStr(txp.fee);
-        $scope.txp = txp;
-        $scope.$apply();
-      };
-
       if (cachedTxp[wallet.id]) {
         apply(cachedTxp[wallet.id]);
       } else {
         stop = $timeout(function() {
-          createTx(wallet, $scope.toAddress, $scope.toAmount, $scope.comment, function(err, txp) {
+          createTx(wallet, $scope.toAddress, $scope.toAmount, $scope.description, function(err, txp) {
             if (err) return;
             cachedTxp[wallet.id] = txp;
             apply(txp);
@@ -122,7 +123,13 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     showAlert(gettext('Error creating transaction'), msg);
   };
 
-  var createTx = function(wallet, toAddress, toAmount, comment, cb) {
+  function apply(txp) {
+    $scope.fee = txFormatService.formatAmountStr(txp.fee);
+    $scope.txp = txp;
+    $scope.$apply();
+  };
+
+  var createTx = function(wallet, toAddress, toAmount, description, cb) {
     var config = configService.getSync().wallet;
 
     //
@@ -133,7 +140,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     var paypro = $scope.paypro;
 
     // ToDo: use a credential's (or fc's) function for this
-    if (comment && !wallet.credentials.sharedEncryptingKey) {
+    if (description && !wallet.credentials.sharedEncryptingKey) {
       var msg = 'Could not add message to imported wallet without shared encrypting key';
       $log.warn(msg);
       return setSendError(gettext(msg));
@@ -148,7 +155,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     outputs.push({
       'toAddress': toAddress,
       'amount': toAmount,
-      'message': comment
+      'message': description
     });
 
     var txp = {};
@@ -161,7 +168,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     }
 
     txp.outputs = outputs;
-    txp.message = comment;
+    txp.message = description;
     txp.payProUrl = paypro ? paypro.url : null;
     txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true;
     txp.feeLevel = config.settings.feeLevel || 'normal';
@@ -176,8 +183,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
 
   $scope.approve = function() {
-    console.log($scope.comment);
-    return;
     var wallet = $scope.wallet;
     var txp = $scope.txp;
     if (!wallet) {