diff --git a/qubesadmin/tools/qvm_start_daemon.py b/qubesadmin/tools/qvm_start_daemon.py
index 7b0829d7..a6ff78df 100644
--- a/qubesadmin/tools/qvm_start_daemon.py
+++ b/qubesadmin/tools/qvm_start_daemon.py
@@ -363,6 +363,7 @@ def __init__(self, binary_string):
         self.options = ",".join(
             opt for opt in self.options.split(",") if not opt.startswith("grp:")
         )
+        self.current_layout = None
 
     def get_property(self, layout_num):
         """Return the selected keyboard layout as formatted for keyboard_layout
@@ -449,10 +450,9 @@ def update_keyboard_layout(self):
         """Update current vm's keyboard_layout property"""
         new_property = self.keyboard_layout.get_property(self.selected_layout)
 
-        current_property = self.current_vm.keyboard_layout
-
-        if new_property != current_property:
+        if new_property != self.keyboard_layout.current_layout:
             self.current_vm.keyboard_layout = new_property
+            self.keyboard_layout.current_layout = new_property
 
     def event_reader(self, callback):
         """Poll for X events related to keyboard layout"""