diff --git a/js/formHandler.js b/js/formHandler.js
index 47ef5bc..98a6edf 100755
--- a/js/formHandler.js
+++ b/js/formHandler.js
@@ -9,7 +9,9 @@ function setFormEditable(edit) {
     if (edit === true) {
         $('#btnPrepare').addClass('hidden');
         $('#btnEdit').removeClass('hidden');
+        $('#btnEdit').removeAttr('disabled');
         $('#btnNew').removeClass('hidden');
+        $('#btnNew').removeAttr('disabled');
     } else {
         $('#btnPrepare').removeClass('hidden');
         $('#btnEdit').addClass('hidden');
@@ -20,4 +22,4 @@ function setFormEditable(edit) {
 var copyToClipboard = function(id) {
     document.getElementById(id).select();
     document.execCommand('copy');
-};
\ No newline at end of file
+};
diff --git a/js/proposalGenerator.js b/js/proposalGenerator.js
index 5aea0eb..552ef47 100755
--- a/js/proposalGenerator.js
+++ b/js/proposalGenerator.js
@@ -115,5 +115,15 @@ ProposalGenerator.prototype.resetProposal = function() {
     $('.createProposal input').each(function() {
         $(this).val('');
     });
-    setFormEditable(true);
+    $("#btnEdit").val('Edit Proposal');
+    $("#btnNew").val('New Proposal');
+    $("#btnPrepare").val('Create Proposal');
+    setFormEditable(false);
+    $('.walletCommands#walletCommandsHeader').addClass('hidden');
+    $('.walletCommands#walletCommandsPrepare').addClass('hidden');
+    $('.walletCommands#walletCommandsTx').addClass('hidden');
+    $('.walletCommands#walletCommandsProgress').addClass('hidden');
+    $('.walletCommands#walletCommandsSubmit').addClass('hidden');
+
+    this._mode = 'proposal';
 };