diff --git a/app/portainer/react/components/index.ts b/app/portainer/react/components/index.ts
index f1721d100..0ba694cbe 100644
--- a/app/portainer/react/components/index.ts
+++ b/app/portainer/react/components/index.ts
@@ -268,7 +268,11 @@ withFormValidation(
 withFormValidation(
   ngModule,
   withUIRouter(
-    withControlledInput(StackEnvironmentVariablesPanel, { values: 'onChange' })
+    withReactQuery(
+      withControlledInput(StackEnvironmentVariablesPanel, {
+        values: 'onChange',
+      })
+    )
   ),
   'stackEnvironmentVariablesPanel',
   ['showHelpMessage', 'isFoldable'],
diff --git a/app/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel.tsx b/app/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel.tsx
index ee63cfd5b..0566ef2e1 100644
--- a/app/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel.tsx
+++ b/app/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel.tsx
@@ -1,6 +1,7 @@
 import { ComponentProps } from 'react';
 
 import { Alert } from '@@/Alert';
+import { useDocsUrl } from '@@/PageHeader/ContextHelp/ContextHelp';
 
 import { EnvironmentVariablesFieldset } from './EnvironmentVariablesFieldset';
 import { EnvironmentVariablesPanel } from './EnvironmentVariablesPanel';
@@ -23,7 +24,9 @@ export function StackEnvironmentVariablesPanel({
         <div>
           You may use{' '}
           <a
-            href="https://docs.portainer.io/v/2.20/user/docker/stacks/add#environment-variables"
+            href={`${useDocsUrl(
+              '/user/docker/stacks/add#environment-variables'
+            )}`}
             target="_blank"
             data-cy="stack-env-vars-help-link"
             rel="noreferrer noopener"