diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py
index 70f07f6..5e08875 100644
--- a/qubesmanager/qube_manager.py
+++ b/qubesmanager/qube_manager.py
@@ -468,8 +468,8 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
             self.table_selection_changed()
 
         if vm.klass == 'TemplateVM':
-            for row in self.vms_in_table:
-                if row.vm.template == vm:
+            for row in self.vms_in_table.values():
+                if getattr(row.vm, 'template', None) == vm:
                     row.info_widget.update_vm_state()
 
     def on_domain_changed(self, vm, _event, **_kwargs):
@@ -883,7 +883,6 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         if reply == QtGui.QMessageBox.Yes:
             self.shutdown_vm(vm)
 
-
     def shutdown_vm(self, vm, shutdown_time=vm_shutdown_timeout,
                     check_time=vm_restart_check_timeout, and_restart=False):
         try: