diff --git a/subiquity/server/controllers/install.py b/subiquity/server/controllers/install.py
index c2a80269..8661710d 100644
--- a/subiquity/server/controllers/install.py
+++ b/subiquity/server/controllers/install.py
@@ -557,7 +557,7 @@ class InstallController(SubiquityController):
             cmd = [
                 "efibootmgr",
                 "--bootorder",
-                ",".join(efi_state_before.order),
+                ",".join(efi_state_before.order + [new_bootnum]),
             ]
             rp_bootnum = new_bootnum
         await self.app.command_runner.run(cmd)
diff --git a/subiquity/server/controllers/tests/test_install.py b/subiquity/server/controllers/tests/test_install.py
index 645df605..20197584 100644
--- a/subiquity/server/controllers/tests/test_install.py
+++ b/subiquity/server/controllers/tests/test_install.py
@@ -264,7 +264,7 @@ class TestInstallController(unittest.IsolatedAsyncioTestCase):
                 [
                     "efibootmgr",
                     "--bootorder",
-                    "0000,0002",
+                    "0000,0002,0003",
                 ]
             ),
         ]
@@ -295,7 +295,14 @@ class TestInstallController(unittest.IsolatedAsyncioTestCase):
                 [
                     "efibootmgr",
                     "--bootorder",
-                    "0000,0002",
+                    "0000,0002,0003",
+                ]
+            ),
+            call(
+                [
+                    "efibootmgr",
+                    "--bootnext",
+                    "0003",
                 ]
             ),
         ]