diff --git a/app/templates/downloadPassword.js b/app/templates/downloadPassword.js
index 47356f04..74da26dc 100644
--- a/app/templates/downloadPassword.js
+++ b/app/templates/downloadPassword.js
@@ -16,6 +16,7 @@ module.exports = function(state, emit) {
       ${label}
       <form id="unlock" onsubmit=${checkPassword}>
         <input id="unlock-input"
+          maxlength="64"
           autocomplete="off"
           placeholder="${state.translate('unlockInputPlaceholder')}"
           type="password"/>
diff --git a/app/templates/uploadPassword.js b/app/templates/uploadPassword.js
index 7deb46b5..d2b16ce0 100644
--- a/app/templates/uploadPassword.js
+++ b/app/templates/uploadPassword.js
@@ -11,6 +11,7 @@ module.exports = function(state, emit) {
     </div>
     <form class="setPassword hidden" onsubmit=${setPassword}>
       <input id="unlock-input"
+        maxlength="64"
         autocomplete="off"
         placeholder="${state.translate('unlockInputPlaceholder')}"/>
       <input type="submit"
diff --git a/assets/main.css b/assets/main.css
index 8e839a99..ea7925c4 100644
--- a/assets/main.css
+++ b/assets/main.css
@@ -646,6 +646,7 @@ tbody {
   padding: 10px 0;
   align-self: left;
   max-width: 100%;
+  overflow-wrap: break-word;
 }
 
 .setPassword {