diff --git a/ui/src/app/form/component/InfoIcon.js b/ui/src/app/form/component/InfoIcon.js
index 209e4f426..a9dbb9363 100644
--- a/ui/src/app/form/component/InfoIcon.js
+++ b/ui/src/app/form/component/InfoIcon.js
@@ -7,7 +7,7 @@ import Button from 'react-bootstrap/Button';
 import Translate from '../../i18n/components/translate';
 import { useTranslator } from '../../i18n/hooks';
 
-export function InfoIcon ({ value = '', placement='left', ...props }) {
+export function InfoIcon ({ value = '', placement='auto', ...props }) {
     const translate = useTranslator();
     return(
         <OverlayTrigger trigger={['hover', 'focus', 'click']} placement={placement} overlay={(
diff --git a/ui/src/app/form/component/fields/DescriptionField.js b/ui/src/app/form/component/fields/DescriptionField.js
index aeea23ace..0b5d67871 100644
--- a/ui/src/app/form/component/fields/DescriptionField.js
+++ b/ui/src/app/form/component/fields/DescriptionField.js
@@ -3,7 +3,7 @@ import { InfoIcon } from "../InfoIcon";
 
 const DescriptionField = ({ description }) => {
     if (description) {
-        return <InfoIcon value={description} />;
+        return <InfoIcon value={description} placement="auto" />;
     }
 
     return null;