diff --git a/dist/vdiclient.json b/dist/vdiclient.json
index d5a0485..c8c0bad 100644
--- a/dist/vdiclient.json
+++ b/dist/vdiclient.json
@@ -1,6 +1,6 @@
 {
 	"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
-	"version" : "1.2.05",
+	"version" : "1.2.06",
 	"product_name" : "VDI Client",
 	"manufacturer" : "Josh Patten",
 	"name" : "VDI Client",
diff --git a/vdiclient.ini.example b/vdiclient.ini.example
index 33f232a..4b88676 100644
--- a/vdiclient.ini.example
+++ b/vdiclient.ini.example
@@ -11,6 +11,8 @@ logo = vdiclient.png
 kiosk = False
 # Enable/Disable Fullscreen mode (not applicable in Kiosk mode)
 fullscreen = True
+# Disable viewer_kiosk mode if kiosk is set to true, this allows overriding remote_viewer kiosk mode
+#viewer_kiosk = False
 # Enable displaying SPICE ini file before opening virt-viewer
 inidebug = False
 # Select which guest types to display. Acceptable values: both, lxc, qemu
diff --git a/vdiclient.py b/vdiclient.py
index 24a803a..efb8567 100644
--- a/vdiclient.py
+++ b/vdiclient.py
@@ -30,6 +30,7 @@ class G:
 	totp = False
 	imagefile = None
 	kiosk = False
+	viewer_kiosk = True
 	fullscreen = True
 	verify_ssl = True
 	icon = None
@@ -96,6 +97,8 @@ def loadconfig(config_location = None):
 				G.imagefile = config['General']['logo']
 		if 'kiosk' in config['General']:
 			G.kiosk = config['General'].getboolean('kiosk')
+		if 'viewer_kiosk' in config['General']:
+			G.viewer_kiosk = config['General'].getboolean('viewer_kiosk')
 		if 'fullscreen' in config['General']:
 			G.fullscreen = config['General'].getboolean('fullscreen')
 		if 'inidebug' in config['General']:
@@ -396,7 +399,7 @@ def vmaction(vmnode, vmid, vmtype, action='connect'):
 		closed = iniwin(inistring)
 	connpop = win_popup(f'Connecting to {vmstatus["name"]}...')
 	pcmd = [G.vvcmd]
-	if G.kiosk:
+	if G.kiosk and G.viewer_kiosk:
 		pcmd.append('--kiosk')
 		pcmd.append('--kiosk-quit')
 		pcmd.append('on-disconnect')