diff --git a/frontend/src/metabase/core/components/FormField/FormField.tsx b/frontend/src/metabase/core/components/FormField/FormField.tsx
index 2bae2740c149222f2083ada6773ed33003ab7be8..b18f081b2e40ac3903646d3439bc48fbe4a957d6 100644
--- a/frontend/src/metabase/core/components/FormField/FormField.tsx
+++ b/frontend/src/metabase/core/components/FormField/FormField.tsx
@@ -2,7 +2,7 @@ import type { HTMLAttributes, ReactNode, Ref } from "react";
 import { forwardRef } from "react";
 import { t } from "ttag";
 
-import Tooltip from "metabase/core/components/Tooltip";
+import { Tooltip } from "metabase/ui";
 
 import {
   FieldCaption,
@@ -82,7 +82,7 @@ const FormField = forwardRef(function FormField(
               <OptionalTag>{t`(optional)`}</OptionalTag>
             )}
             {(infoLabel || infoTooltip) && (
-              <Tooltip tooltip={infoTooltip} maxWidth="100%">
+              <Tooltip multiline label={infoTooltip}>
                 {infoLabel ? (
                   <FieldInfoLabel>{infoLabel}</FieldInfoLabel>
                 ) : (