diff --git a/react/src/components/DefaultProviders.tsx b/react/src/components/DefaultProviders.tsx
index 1253859140..bcac71d5cb 100644
--- a/react/src/components/DefaultProviders.tsx
+++ b/react/src/components/DefaultProviders.tsx
@@ -130,7 +130,7 @@ const DefaultProviders: React.FC<DefaultProvidersProps> = ({
                   <ConfigProvider
                     // @ts-ignore
                     getPopupContainer={(triggerNode) => {
-                      return shadowRoot;
+                      return triggerNode?.parentNode || shadowRoot;
                     }}
                     //TODO: apply other supported locales
                     locale={'ko' === lang ? ko_KR : en_US}
diff --git a/react/src/fix_antd.css b/react/src/fix_antd.css
index da292a798d..0e8f237867 100644
--- a/react/src/fix_antd.css
+++ b/react/src/fix_antd.css
@@ -52,7 +52,13 @@
   }
 }
 
+/* fix: fixed column shadow display outside of a table wrapper */
 .ant-table-wrapper {
   border-radius: 8px 8px 0 0;
   overflow: hidden;
 }
+
+/* fix: the tooltip does not appear in the `<Form.Item tooltip={'something'}` when the popup container is a parent node of the trigger node. */
+.ant-form-item-label {
+  overflow: unset !important;
+}