diff --git a/js/customElements/pwgen.js b/js/customElements/pwgen.js
index c8d198049a0d453472d5a7add6de9894b52022ee..d54ff9707031dd8d551b040ff4531267b48c36b8 100644
--- a/js/customElements/pwgen.js
+++ b/js/customElements/pwgen.js
@@ -22,6 +22,20 @@ class PasswordGenerator extends HTMLElement {
 
         pwlen.oninput = () => {
             pwlenSpan.innerText = pwlen.value;
+            button.click();
+        }
+
+        includeNum.onchange = () => {
+            button.click();
+        }
+        includeBigChar.onchange = () => {
+            button.click();
+        }
+        includeSmallChar.onchange = () => {
+            button.click();
+        }
+        includeSpecialChat.onchange = () => {
+            button.click();
         }
 
         button.onclick = () => {