diff --git a/public/views/backupWords.html b/public/views/backupWords.html
index a041e3f50..4a8199cb3 100644
--- a/public/views/backupWords.html
+++ b/public/views/backupWords.html
@@ -27,7 +27,9 @@
     <div class="row m10b">
       <div class="columns">
         <div class="p10 panel" ng-class="{'enable_text_select': index.network == 'testnet'}">
-          <div id="addWord"></div>
+          <div id="addWord">
+            <!-- <button class="button radius tiny" style="white-space:nowrap" ng-click="wordsC.removeButton('quiz')" id="{{word}}">ASD</button> -->
+          </div>
         </div>
         <div class="p10" style="background:white" ng-class="{'enable_text_select': index.network == 'testnet'}">
           <span ng-repeat="word in wordsC.mnemonicWords track by $index">
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index 5bf5bfc4a..f787dbc31 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -88,30 +88,40 @@ angular.module('copayApp.controllers').controller('wordsController',
       }
     }
 
+    self.enableButton = function(word) {
+      document.getElementById(word).disabled = false;
+      lodash.remove(customSortWords, function(v) {
+        return v == word;
+      });
+    }
+
     self.disableButton = function(word) {
       document.getElementById(word).disabled = true;
-      $scope.seed += word + ' ';
       customSortWords.push(word);
-
-      if (customSortWords.length == 12)
-        self.shouldContinue(customSortWords);
-
       self.addButton(word);
     }
 
     self.addButton = function(word) {
+      var asd = 'apospodk';
       var btnhtml = '<button class="button radius tiny" style="white-space:nowrap" ' +
-        'ng - click = "wordsC.removeButton(' + word + ')" id = "{{' + word + '_}}" > ' + word + ' </button>';
+        'data-ng-click="wordsC.removeButton($event)" id="_' + word + '" > ' + word + ' </button>';
       var temp = $compile(btnhtml)($scope);
       angular.element(document.getElementById('addWord')).append(temp);
+      self.shouldContinue(customSortWords);
     }
 
-    self.removeButton = function(word) {
-
+    self.removeButton = function(event) {
+      var id = (event.target.id);
+      var element = document.getElementById(id);
+      element.remove();
+      self.enableButton(id.substring(1));
+      self.shouldContinue(customSortWords);
     }
 
     self.shouldContinue = function(customSortWords) {
       if (lodash.isEqual(self.mnemonicWords, customSortWords))
         self.sorted = true;
+      else
+        self.sorted = false;
     }
   });