diff --git a/CHANGELOG b/CHANGELOG
index 76ce284..5f83946 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+0.4.3 (9-12-2017)
+=========================
+- Create password generator dialog only when clicking the icon
+- Some adjustments to jQuery CSS scope
+
 0.4.2 (27-11-2017)
 =========================
 - Fixed HTTP authentication with multiple credentials (credits to smorks)
diff --git a/keepassxc-browser/keepassxc-browser.css b/keepassxc-browser/keepassxc-browser.css
index 2a1b2ec..66dca5d 100644
--- a/keepassxc-browser/keepassxc-browser.css
+++ b/keepassxc-browser/keepassxc-browser.css
@@ -68,7 +68,7 @@ input.genpw-text {
 	border-collapse: separate;
 }
 
-.genpw-input-group {
+.kpxc .genpw-input-group {
 	position: relative;
 	display: table;
 	border-collapse: separate;
@@ -90,6 +90,12 @@ input.genpw-text {
 	background-size: contain;
 }
 
+.kpxc .cip-genpw-checkbox {
+	-webkit-appearance: checkbox !important;
+	-moz-appearance: checkbox !important;
+	appearance: checkbox !important;
+}
+
 #cip-genpw-btn-fillin {
 	margin-right: 5px;
 }
diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js
index 06a4006..e74d3e5 100644
--- a/keepassxc-browser/keepassxc-browser.js
+++ b/keepassxc-browser/keepassxc-browser.js
@@ -89,7 +89,7 @@ cipAutocomplete.init = function(field) {
 
 	let acMenu = jQuery('#kpxc-ac-menu');
 	if (acMenu.length == 0) {
-		jQuery('<div id="kpxc-ac-menu" class="kpxc"></div>').appendTo('body');
+		jQuery('<div id=\"kpxc-ac-menu\" class=\"kpxc\"></div>').appendTo('body');
 	}
 
 	field
@@ -155,8 +155,6 @@ cipAutocomplete.onFocus = function() {
 	}
 };
 
-
-
 var cipPassword = {};
 cipPassword.observedIcons = [];
 cipPassword.observingLock = false;
@@ -184,7 +182,6 @@ cipPassword.initField = function(field, inputs, pos) {
 	field.data('cip-password-generator', true);
 
 	cipPassword.createIcon(field);
-	cipPassword.createDialog();
 
 	let $found = false;
 	if (inputs) {
@@ -247,7 +244,13 @@ cipPassword.createDialog = function() {
 	$dialog.hide();
 	jQuery('body').append($dialog);
 
+	let $container = jQuery('#kpxc-pw-dialog');
+	if ($container.length === 0) {
+		jQuery('<div id=\"kpxc-pw-dialog\" class=\"kpxc\"></div>').appendTo('body');
+	}
+
 	$dialog.dialog({
+		appendTo: '#kpxc-pw-dialog',
 		autoOpen: false,
 		modal: true,
 		resizable: false,
@@ -314,8 +317,6 @@ cipPassword.createDialog = function() {
 			}
 		},
 		open: function(event, ui) {
-			// Dirty hacks for overlay and custom CSS
-			jQuery('.ui-widget-overlay').wrap('<span class="kpxc"></span>');
 			jQuery('.ui-widget-overlay').click(function() {
 				jQuery('#cip-genpw-dialog:first').dialog('close');
 				jQuery('span').remove('.kpxc');
@@ -324,10 +325,7 @@ cipPassword.createDialog = function() {
 			if (jQuery('input#cip-genpw-textfield-password:first').val() === '') {
 				jQuery('button#cip-genpw-btn-generate:first').click();
 			}
-		},
-		create: function(event, ui) {
-	        jQuery('.ui-dialog').wrap('<div class="kpxc"></span>');
-	    }
+		}
 	});
 };
 
@@ -337,7 +335,9 @@ cipPassword.createIcon = function(field) {
 	let $offset = Math.floor((field.outerHeight() - $size) / 3);
 	$offset = ($offset < 0) ? 0 : $offset;
 
-	const $icon = jQuery('<div>').addClass('cip-genpw-icon')
+	const $icon = jQuery('<div>')
+		.addClass('kpxc')
+		.addClass('cip-genpw-icon')
 		.addClass($className)
 		.attr('title', 'Generate password')
 		.css('z-index', '9999')
@@ -356,10 +356,12 @@ cipPassword.createIcon = function(field) {
 			return;
 		}
 
+		cipPassword.createDialog();
 		const $dialog = jQuery('#cip-genpw-dialog');
 		if ($dialog.dialog('isOpen')) {
 			$dialog.dialog('close');
 		}
+
 		$dialog.dialog('option', 'position', { my: 'left-10px top', at: 'center bottom', of: jQuery(this) });
 		$dialog.data('cip-genpw-field-id', field.data('cip-id'));
 		$dialog.data('cip-genpw-next-field-id', field.data('cip-genpw-next-field-id'));
diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json
index ae67e9e..e43a67e 100644
--- a/keepassxc-browser/manifest.json
+++ b/keepassxc-browser/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "keepassxc-browser",
-	"version": "0.4.2",
+	"version": "0.4.3",
 	"description": "KeePassXC integration for modern web browsers",
 	"author": "Sami Vänttinen",
 	"icons": {