diff --git a/src/server/components/resolve-entry-by-link.ts b/src/server/components/resolve-entry-by-link.ts
index 7a1c91e3cc..a8876343c1 100644
--- a/src/server/components/resolve-entry-by-link.ts
+++ b/src/server/components/resolve-entry-by-link.ts
@@ -30,6 +30,7 @@ async function resolveEntryByLink({
         const idOrKeyOrReport =
             url.pathname
                 .replace(/^\/navigation\//, '')
+                .replace(/^\/navigate\//, '')
                 .replace(/^\/wizard\/preview\//, '')
                 .replace(
                     /^(\/(ChartPreview|preview))?(\/(ChartWizard|wizard|ChartEditor|editor))?\/?/,
diff --git a/src/ui/libs/DatalensChartkit/menu/MenuItems.tsx b/src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
index b79cf495da..65c88e9954 100644
--- a/src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
+++ b/src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
@@ -176,7 +176,11 @@ export const getEditMenuItem = ({
             window.open(
                 (dataProvider || chartsDataProvider)?.getGoAwayLink(
                     {loadedData, propsData},
-                    {idPrefix: '/navigation/'},
+                    {
+                        idPrefix: Utils.isEnabledFeature(Feature.UseNavigation)
+                            ? '/navigation/'
+                            : '/navigate/',
+                    },
                 ),
             );
         }),
diff --git a/src/ui/libs/DatalensChartkit/modules/menu/menu.ts b/src/ui/libs/DatalensChartkit/modules/menu/menu.ts
index 4453da25fe..e7955cc9c8 100644
--- a/src/ui/libs/DatalensChartkit/modules/menu/menu.ts
+++ b/src/ui/libs/DatalensChartkit/modules/menu/menu.ts
@@ -58,9 +58,6 @@ export const getChartkitMenuByType = (props?: GetChartkitMenuByType) => {
             },
             [MenuItemsIds.EDIT]: {
                 title: i18n('dash.chartkit-menu.view', 'button_edit'),
-                action: ({propsData: {id, params}}) => {
-                    window.open(`/navigate/${id}?${stringify(params)}`);
-                },
                 ...isEditVisible,
             },
             [MenuItemsIds.EXPORT]: {
diff --git a/src/ui/units/dash/modules/helpers.ts b/src/ui/units/dash/modules/helpers.ts
index e5af44dd6d..6b8cd301b0 100644
--- a/src/ui/units/dash/modules/helpers.ts
+++ b/src/ui/units/dash/modules/helpers.ts
@@ -177,7 +177,7 @@ export function addOperationForValue(args: {
 export function getChartEditLink(entryId: string) {
     return Utils.isEnabledFeature(Feature.UseNavigation)
         ? `${window.DL.endpoints.charts}/navigation/${entryId}`
-        : `${window.DL.endpoints.wizard}/${entryId}`;
+        : `/navigate/${entryId}`;
 }
 
 export function deepAssign(...args: any) {