diff --git a/app/templates/share.js b/app/templates/share.js
index 72dac63d..21916cc6 100644
--- a/app/templates/share.js
+++ b/app/templates/share.js
@@ -64,7 +64,9 @@ module.exports = function(state, emit) {
       );
       await delay(2000);
       input.disabled = false;
-      copyBtn.disabled = false;
+      if (!copyBtn.parentNode.classList.contains('wait-password')) {
+        copyBtn.disabled = false;
+      }
       copyBtn.classList.remove('success');
       copyBtn.textContent = state.translate('copyUrlFormButton');
     }
diff --git a/app/templates/uploadPassword.js b/app/templates/uploadPassword.js
index 84fa7797..d68368c6 100644
--- a/app/templates/uploadPassword.js
+++ b/app/templates/uploadPassword.js
@@ -22,13 +22,17 @@ module.exports = function(state, emit) {
   </div>`;
 
   function togglePasswordInput(e) {
+    const unlockInput = document.getElementById('unlock-input');
+    const boxChecked = e.target.checked;
     document.querySelector('.setPassword').classList.toggle('hidden');
     document
       .getElementById('copy')
-      .classList.toggle('wait-password', e.target.checked);
-    document.getElementById('copy-btn').disabled = e.target.checked;
-    if (e.target.checked) {
-      document.getElementById('unlock-input').focus();
+      .classList.toggle('wait-password', boxChecked);
+    document.getElementById('copy-btn').disabled = boxChecked;
+    if (boxChecked) {
+      unlockInput.focus();
+    } else {
+      unlockInput.value = '';
     }
   }