diff --git a/qubesadmin/tools/qvm_start_daemon.py b/qubesadmin/tools/qvm_start_daemon.py
index 5ccf69a..edb4db3 100644
--- a/qubesadmin/tools/qvm_start_daemon.py
+++ b/qubesadmin/tools/qvm_start_daemon.py
@@ -127,7 +127,9 @@ def set_keyboard_layout(vm):
         xkb_rules_names = subprocess.check_output(
             ['xprop', '-root', '_XKB_RULES_NAMES']).decode()
         xkb_parsed = re.match(xkb_re, xkb_rules_names)
-        xkb_layout = [x.split(',')[0] for x in xkb_parsed.groups()[2:5]]
+        xkb_layout = [x.split(',')[0] for x in xkb_parsed.groups()[2:4]]
+        # We keep all options
+        xkb_layout.append(xkb_parsed.group(5))
         keyboard_layout = '+'.join(xkb_layout)
         vm.features['keyboard-layout'] = keyboard_layout
     except subprocess.CalledProcessError as e: