diff --git a/src/popup/pwgen.css b/src/popup/pwgen.css
index 333d61b..718675f 100644
--- a/src/popup/pwgen.css
+++ b/src/popup/pwgen.css
@@ -58,7 +58,7 @@ input[type="checkbox"] {
   text-align: center;
   margin-right: -15px;
   margin-left: -19px;
-  margin-top: -1px;
+  margin-top: -27px;
 }
 
 .fadein {
diff --git a/src/popup/pwgen.html b/src/popup/pwgen.html
index 6dd52c2..e4d1e7e 100644
--- a/src/popup/pwgen.html
+++ b/src/popup/pwgen.html
@@ -10,8 +10,6 @@
   </head>
 
 <body>
-  <div class="copied" style="display: none;">Password copied to clipboard</div>
-
   <form>
     <div>
       <input type="text" id="pw" name="pw">
@@ -42,6 +40,7 @@
     <div>
       <input type="checkbox" id="directcopy" name="directcopy" title="The next time the toolbar button is clicked, the password is copied to the clipboard directly">
       <label for="directcopy">Copy directly</label>
+      <div class="copied" style="display: none;">Password copied to clipboard</div>
     </div>
 
   </form>
diff --git a/src/popup/pwgen.js b/src/popup/pwgen.js
index 821fe9a..f052fbf 100644
--- a/src/popup/pwgen.js
+++ b/src/popup/pwgen.js
@@ -80,6 +80,10 @@ document.addEventListener('DOMContentLoaded', function() {
     ev.preventDefault();
     var params = getParams();
     document.getElementById('pw').value = randPassword(generateLength(), params.special, params.exclude);
+
+    if (params.directcopy) {
+      copypasstoclippboard();
+    }
   });
 
   document.getElementById('copy').addEventListener('click', (ev) => {
