diff --git a/.changeset/thick-peas-rest.md b/.changeset/thick-peas-rest.md
new file mode 100644
index 00000000000..3c79b763658
--- /dev/null
+++ b/.changeset/thick-peas-rest.md
@@ -0,0 +1,5 @@
+---
+'@talend/design-system': patch
+---
+
+fix: Change InlineEdit tooltip position on buttons to prevent z-index issues depending on implementation
diff --git a/packages/design-system/src/components/InlineEditing/Primitives/InlineEditingPrimitive.tsx b/packages/design-system/src/components/InlineEditing/Primitives/InlineEditingPrimitive.tsx
index 85567e4bf53..90705686faa 100644
--- a/packages/design-system/src/components/InlineEditing/Primitives/InlineEditingPrimitive.tsx
+++ b/packages/design-system/src/components/InlineEditing/Primitives/InlineEditingPrimitive.tsx
@@ -267,6 +267,7 @@ const InlineEditingPrimitive = forwardRef(
 										data-test={`${dataTest ? `${dataTest}.` : ''}inlineediting.button.cancel`}
 										data-testid={`${dataTestId ? `${dataTestId}.` : ''}inlineediting.button.cancel`}
 										size="XS"
+										tooltipPlacement="bottom"
 									>
 										{t('INLINE_EDITING_CANCEL', 'Cancel')}
 									</ButtonIcon>
@@ -277,6 +278,7 @@ const InlineEditingPrimitive = forwardRef(
 										data-testid={`${dataTestId ? `${dataTestId}.` : ''}inlineediting.button.submit`}
 										{...getDataAttrFromProps(rest)}
 										size="XS"
+										tooltipPlacement="bottom"
 									>
 										{t('INLINE_EDITING_SUBMIT', 'Submit')}
 									</ButtonIcon>
@@ -305,6 +307,7 @@ const InlineEditingPrimitive = forwardRef(
 								icon="pencil"
 								disabled={loading}
 								size="XS"
+								tooltipPlacement="bottom"
 							>
 								{t('INLINE_EDITING_EDIT', 'Edit')}
 							</ButtonIcon>