diff --git a/app/templates/share.js b/app/templates/share.js
index d785d109..2aa31230 100644
--- a/app/templates/share.js
+++ b/app/templates/share.js
@@ -106,7 +106,18 @@ module.exports = function(state, emit) {
   `;
 
   function passwordComplete(password) {
-    const el = html`<div class="selectPassword">
+    const passwordSpan = html([
+      `<span>${state.translate('passwordResult', {
+        password:
+          '<pre class="passwordOriginal"></pre><pre class="passwordMask"></pre>'
+      })}</span>`
+    ]);
+    const og = passwordSpan.querySelector('.passwordOriginal');
+    const masked = passwordSpan.querySelector('.passwordMask');
+    og.textContent = password;
+    masked.textContent = password.replace(/./g, '●');
+    return html`<div class="selectPassword">
+      ${passwordSpan}
       <button
         id="resetButton"
         onclick=${toggleResetInput}
@@ -129,20 +140,6 @@ module.exports = function(state, emit) {
           value="${state.translate('changePasswordButton')}"/>
       </form>
       </div>`;
-
-    const passwordSpan = html([
-      `<span>${state.translate('passwordResult', {
-        password:
-          '<pre class="passwordOriginal"></pre><pre class="passwordStar"></pre>'
-      })}</span>`
-    ]);
-    passwordSpan.querySelector('.passwordOriginal').textContent = password;
-    passwordSpan.querySelector('.passwordStar').textContent = password.replace(
-      /./g,
-      '●'
-    );
-    el.insertBefore(passwordSpan, el.firstElementChild);
-    return el;
   }
 
   function resetPassword(event) {
diff --git a/assets/main.css b/assets/main.css
index 464203bc..65d8bea1 100644
--- a/assets/main.css
+++ b/assets/main.css
@@ -702,7 +702,7 @@ tbody {
   display: inline;
 }
 
-.selectPassword :hover .passwordStar {
+.selectPassword :hover .passwordMask {
   display: none;
 }