diff --git a/api-catalog-ui/frontend/src/components/Wizard/WizardComponents/WizardInputs.jsx b/api-catalog-ui/frontend/src/components/Wizard/WizardComponents/WizardInputs.jsx
index b8b834f0c9..5e987b803b 100644
--- a/api-catalog-ui/frontend/src/components/Wizard/WizardComponents/WizardInputs.jsx
+++ b/api-catalog-ui/frontend/src/components/Wizard/WizardComponents/WizardInputs.jsx
@@ -13,11 +13,11 @@ import {
     Checkbox,
     FormControl,
     FormControlLabel,
-    FormHelperText,
     InputLabel,
     MenuItem,
     Select,
     Input,
+    TextField,
     Tooltip,
 } from '@material-ui/core';
 import DeleteIcon from '@material-ui/icons/Delete';
@@ -444,17 +444,20 @@ class WizardInputs extends Component {
         const captionId = `my-helper${itemKey}`;
         return (
             <Tooltip className="wizardTooltip" title={finalTooltip}>
-                <FormControl className="wizardFormFields" disabled={disabled}>
-                    <InputLabel shrink>{question}</InputLabel>
-                    <Input
-                        id={itemKey}
-                        name={itemKey}
-                        value={value}
-                        onChange={(event) => this.handleInputChange(event, index)}
-                        aria-describedby={captionId}
-                    />
-                    <FormHelperText id={captionId}>{caption}</FormHelperText>
-                </FormControl>
+                <TextField
+                    variant="outlined"
+                    fullWidth
+                    className="wizardFormFields"
+                    label={question}
+                    value={value}
+                    onChange={(event) => this.handleInputChange(event, index)}
+                    helperText={caption}
+                    disabled={disabled}
+                    InputLabelProps={{ shrink: true }}
+                    id={itemKey}
+                    name={itemKey}
+                    FormHelperTextProps={{ id: captionId }}
+                />
             </Tooltip>
         );
     }