diff --git a/src/components/DevboxCreatePage.tsx b/src/components/DevboxCreatePage.tsx
index 964cb8ed..3e7546e1 100644
--- a/src/components/DevboxCreatePage.tsx
+++ b/src/components/DevboxCreatePage.tsx
@@ -1106,6 +1106,7 @@ export const DevboxCreatePage = ({
 
     return (
       <ResourcePicker<GatewayConfig>
+        key="gateway-config-picker"
         config={{
           title: "Select Gateway Config",
           fetchPage: async (params) => {
@@ -1167,6 +1168,7 @@ export const DevboxCreatePage = ({
 
     return (
       <ResourcePicker<SecretListItem>
+        key="secret-picker"
         config={{
           title: "Select Secret for Gateway",
           fetchPage: async (params) => {