diff --git a/qubesmanager/create_new_vm.py b/qubesmanager/create_new_vm.py
index 2523b1f..0e416d1 100644
--- a/qubesmanager/create_new_vm.py
+++ b/qubesmanager/create_new_vm.py
@@ -233,14 +233,16 @@ class NewVmDlg(QtWidgets.QDialog, Ui_NewVMDlg):
         # AppVM
         if self.vm_type.currentIndex() == 0:
             self.template_vm.setEnabled(True)
-            self.template_vm.setCurrentIndex(0)
+            if self.template_vm.currentIndex() == -1:
+                self.template_vm.setCurrentIndex(0)
             self.install_system.setEnabled(False)
             self.install_system.setChecked(False)
 
         # Standalone - based on a template
         if self.vm_type.currentIndex() == 1:
             self.template_vm.setEnabled(True)
-            self.template_vm.setCurrentIndex(0)
+            if self.template_vm.currentIndex() == -1:
+                self.template_vm.setCurrentIndex(0)
             self.install_system.setEnabled(False)
             self.install_system.setChecked(False)