diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
index 4cb14b62e..3fec1dda0 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
@@ -98,8 +98,12 @@ export function WizardDocker({ onCreate, isDockerStandalone }: Props) {
           <EdgeAgentTab
             onCreate={(environment) => onCreate(environment, 'dockerEdgeAgent')}
             commands={{
-              linux: [commandsTabs.swarmLinux, commandsTabs.standaloneLinux],
-              win: [commandsTabs.swarmWindows, commandsTabs.standaloneWindow],
+              linux: isDockerStandalone
+                ? [commandsTabs.standaloneLinux]
+                : [commandsTabs.swarmLinux],
+              win: isDockerStandalone
+                ? [commandsTabs.standaloneWindow]
+                : [commandsTabs.swarmWindows],
             }}
           />
         );