diff --git a/app/portainer/__module.js b/app/portainer/__module.js
index 0e81f2394..b17ccf874 100644
--- a/app/portainer/__module.js
+++ b/app/portainer/__module.js
@@ -202,17 +202,6 @@ angular
         },
       };
 
-      var endpointCreation = {
-        name: 'portainer.endpoints.new',
-        url: '/new',
-        views: {
-          'content@': {
-            templateUrl: './views/endpoints/create/createendpoint.html',
-            controller: 'CreateEndpointController',
-          },
-        },
-      };
-
       var edgeDeviceCreation = {
         name: 'portainer.endpoints.newEdgeDevice',
         url: '/newEdgeDevice',
@@ -498,7 +487,6 @@ angular
       $stateRegistryProvider.register(endpointAccess);
       $stateRegistryProvider.register(endpointKVM);
       $stateRegistryProvider.register(edgeDeviceCreation);
-      $stateRegistryProvider.register(endpointCreation);
       $stateRegistryProvider.register(deviceImport);
       $stateRegistryProvider.register(addFDOProfile);
       $stateRegistryProvider.register(editFDOProfile);
diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
index 39de6f826..21d4ac8d0 100644
--- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
+++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
@@ -14,7 +14,7 @@
         >
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="portainer.endpoints.new" data-cy="endpoint-addEndpointButton">
+        <button type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.setRefferer()" ui-sref="portainer.wizard.endpoints" data-cy="endpoint-addEndpointButton">
           <i class="fa fa-plus-circle space-right" aria-hidden="true"></i>Add environment
         </button>
       </div>
diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js
index a20f43641..bbb221c5a 100644
--- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js
+++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js
@@ -34,6 +34,10 @@ angular.module('portainer.app').controller('EndpointsDatatableController', [
       this.paginationChanged();
     };
 
+    this.setRefferer = function () {
+      window.localStorage.setItem('wizardRefferer', 'environments');
+    };
+
     /**
      * Overridden
      */
diff --git a/app/portainer/home/EnvironmentList/NoEnvironmentsInfoPanel.tsx b/app/portainer/home/EnvironmentList/NoEnvironmentsInfoPanel.tsx
index 3270007b4..bf2b6b57c 100644
--- a/app/portainer/home/EnvironmentList/NoEnvironmentsInfoPanel.tsx
+++ b/app/portainer/home/EnvironmentList/NoEnvironmentsInfoPanel.tsx
@@ -8,9 +8,9 @@ export function NoEnvironmentsInfoPanel({ isAdmin }: { isAdmin: boolean }) {
       <TextTip>
         {isAdmin ? (
           <span>
-            No environment available for management. Please head over the
-            <Link to="portainer.endpoints.new"> environments view </Link>
-            to add an environment.
+            No environment available for management. Please head over the{' '}
+            <Link to="portainer.wizard.endpoints">environment wizard</Link> to
+            add an environment.
           </span>
         ) : (
           <span>
diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html
index d33444b9e..3edf10c97 100644
--- a/app/portainer/views/sidebar/sidebar.html
+++ b/app/portainer/views/sidebar/sidebar.html
@@ -73,7 +73,7 @@
             label="Environments"
             path="portainer.endpoints"
             is-sidebar-open="toggle"
-            children-paths="['portainer.endpoints.endpoint', 'portainer.endpoints.new', 'portainer.endpoints.endpoint.access', 'portainer.groups', 'portainer.groups.group', 'portainer.groups.group.access', 'portainer.groups.new', 'portainer.tags']"
+            children-paths="['portainer.endpoints.endpoint', 'portainer.wizard', 'portainer.endpoints.endpoint.access', 'portainer.groups', 'portainer.groups.group', 'portainer.groups.group.access', 'portainer.groups.new', 'portainer.tags']"
           >
             <sidebar-menu-item path="portainer.groups" class-name="sidebar-sublist" data-cy="portainerSidebar-endpointGroups" title="Groups">Groups</sidebar-menu-item>
             <sidebar-menu-item path="portainer.tags" class-name="sidebar-sublist" data-cy="portainerSidebar-endpointTags" title="Tags">Tags</sidebar-menu-item>
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
index 431465d14..c7a4ffb24 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
@@ -118,6 +118,11 @@ export function EnvironmentCreationView() {
         ])
       ),
     });
+    if (localStorage.getItem('wizardRefferer') === 'environments') {
+      localStorage.removeItem('wizardRefferer');
+      router.stateService.go('portainer.endpoints');
+      return;
+    }
     router.stateService.go('portainer.home');
   }
 }