diff --git a/src/js/controllers/tx-details.js b/src/js/controllers/tx-details.js
index a5b32499a..29d1bac81 100644
--- a/src/js/controllers/tx-details.js
+++ b/src/js/controllers/tx-details.js
@@ -178,33 +178,25 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
 
   var updateTxDebounced = lodash.debounce(updateTx, 5000);
 
-  $scope.showCommentPopup = function() {
-    var opts = {};
-    if ($scope.btx.message) {
-      opts.defaultText = $scope.btx.message;
-    }
-    if ($scope.btx.note && $scope.btx.note.body) opts.defaultText = $scope.btx.note.body;
+  $scope.updateNote = function(text) {
+    if (typeof text == "undefined") return;
+    $scope.btx.note = {
+      body: text
+    };
 
-    popupService.showPrompt($scope.wallet.name, gettextCatalog.getString('Memo'), opts, function(text) {
-      if (typeof text == "undefined") return;
+    $log.debug('Saving memo');
 
-      $scope.btx.note = {
-        body: text
-      };
-      $log.debug('Saving memo');
+    var args = {
+      txid: $scope.btx.txid,
+      body: text
+    };
 
-      var args = {
-        txid: $scope.btx.txid,
-        body: text
-      };
-
-      walletService.editTxNote($scope.wallet, args, function(err, res) {
-        if (err) {
-          $log.debug('Could not save tx comment ' + err);
-        }
-      });
+    walletService.editTxNote($scope.wallet, args, function(err, res) {
+      if (err) {
+        $log.debug('Could not save tx comment ' + err);
+      }
     });
-  };
+  }
 
   $scope.viewOnBlockchain = function() {
     var btx = $scope.btx;
diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss
index 0549bef6f..092d3acb4 100644
--- a/src/sass/views/includes/txp-details.scss
+++ b/src/sass/views/includes/txp-details.scss
@@ -58,7 +58,7 @@
   }
   .info {
     span {
-      display: block;
+      display: inline-block;
     }
     .badge {
       border-radius: 0;
diff --git a/www/views/tx-details.html b/www/views/tx-details.html
index fc3b729fc..364c88246 100644
--- a/www/views/tx-details.html
+++ b/www/views/tx-details.html
@@ -105,13 +105,12 @@
             <time>{{ (btx.ts || btx.createdOn || btx.time) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
           </span>
         </div>
-        <a class="item item-icon-right" ng-class="{'single-line': !btx.note.body && !btx.message}" ng-click="showCommentPopup()">
-          <span class="label" translate>Memo</span>
-          <div class="item-note" style="display: block; float: none; margin-bottom: .25rem;">
-            {{btx.note.body || btx.message}}
-          </div>
-          <i class="icon bp-arrow-right"></i>
-        </a>
+        <div class="item single-line">
+          <span class="label" translate>
+            Memo: &emsp;
+            <input style="display:inline-block;" class="label" type="text" placeholder="{{btx.note.body || btx.message || 'Enter text here'}}" ng-model="btx.note.body" ng-blur="updateNote(btx.note.body)"/>
+          </span>
+        </div>
         <div class="item" ng-if="btx.action != 'received'">
           <span class="label" translate>Fee</span>
           <span class="m10l">{{btx.feeStr || '...'}}</span>