diff --git a/src/popup/pwgen.html b/src/popup/pwgen.html
index 0b7119f..8a91477 100644
--- a/src/popup/pwgen.html
+++ b/src/popup/pwgen.html
@@ -15,7 +15,9 @@
   <form>
 
     <div>
-      <label for"length">length <input type="number" id="length" value="14" min="0" name="length"></label>
+      <label>length</label>
+      <label for"length-min">min <input type="number" id="length-min" value="14" min="0" name="length-min" style="width: 50px;"></label>
+      <label for"length-max">max <input type="number" id="length-max" value="18" min="0" name="length-max" style="width: 50px;"></label>
     </div>
 
     <div>
diff --git a/src/popup/pwgen.js b/src/popup/pwgen.js
index 8142faa..8c7d527 100644
--- a/src/popup/pwgen.js
+++ b/src/popup/pwgen.js
@@ -14,9 +14,14 @@ function randPassword(length, includeSpecial) {
   return randPwd;
 }
 
+function generateLength() {
+  return Math.floor(Math.random() * getParams().lengthMax - getParams().lengthMin + 1) + getParams().lengthMin;
+}
+
 function getParams() {
   return {
-    length: parseInt(document.getElementById('length').value),
+    lengthMin: parseInt(document.getElementById('length-min').value),
+    lengthMax: parseInt(document.getElementById('length-max').value),
     special: document.getElementById('special').checked,
     directcopy: document.getElementById('directcopy').checked
   }
@@ -24,7 +29,8 @@ function getParams() {
 
 function loadOptions() {
   return browser.storage.local.get({
-    length: 14,
+    lengthMin: 14,
+    lengthMax: 17,
     special: true,
     directcopy: false
   });
@@ -65,7 +71,7 @@ document.addEventListener('DOMContentLoaded', function() {
   document.getElementById('new').addEventListener('click', (ev) => {
     ev.preventDefault();
     var params = getParams();
-    document.getElementById('pw').value = randPassword(params.length, params.special);
+    document.getElementById('pw').value = randPassword(generateLength(), params.special);
   });
 
   document.getElementById('copy').addEventListener('click', (ev) => {
@@ -81,10 +87,11 @@ document.addEventListener('DOMContentLoaded', function() {
   }
 
   loadOptions().then((options) => {
-    document.getElementById('length').value = options.length;
+    document.getElementById('length-min').value = options.lengthMin;
+    document.getElementById('length-max').value = options.lengthMax;
     document.getElementById('special').checked = options.special;
     document.getElementById('directcopy').checked = options.directcopy;
-    document.getElementById('pw').value = randPassword(getParams().length, getParams().special);
+    document.getElementById('pw').value = randPassword(generateLength(), getParams().special);
 
     if (options.directcopy) {
       copypasstoclippboard();