diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f5c28ed4bf..58fbb38c5e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6264,7 +6264,7 @@ qemuProcessPrepareDomainNUMAPlacement(virDomainObj *vm)
 
 
 static void
-qemuProcessPrepareDomainDiskBootorder(virDomainDef *def)
+qemuProcessPrepareDeviceBootorder(virDomainDef *def)
 {
     size_t i;
     unsigned int bootCD = 0;
@@ -6350,8 +6350,6 @@ qemuProcessPrepareDomainStorage(virQEMUDriver *driver,
             return -1;
     }
 
-    qemuProcessPrepareDomainDiskBootorder(vm->def);
-
     return 0;
 }
 
@@ -6559,6 +6557,8 @@ qemuProcessPrepareDomain(virQEMUDriver *driver,
     if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0)
         return -1;
 
+    qemuProcessPrepareDeviceBootorder(vm->def);
+
     VIR_DEBUG("Setting graphics devices");
     if (qemuProcessSetupGraphics(driver, vm, priv->qemuCaps, flags) < 0)
         return -1;