diff --git a/ui/apps/everest/src/pages/settings/storage-locations/createEditModal/create-edit-form.tsx b/ui/apps/everest/src/pages/settings/storage-locations/createEditModal/create-edit-form.tsx
index d67f42a19..653bc4170 100644
--- a/ui/apps/everest/src/pages/settings/storage-locations/createEditModal/create-edit-form.tsx
+++ b/ui/apps/everest/src/pages/settings/storage-locations/createEditModal/create-edit-form.tsx
@@ -63,6 +63,7 @@ export const CreateEditStorageForm = ({ isEditMode }: CreateEditFormProps) => {
         textFieldProps={{
           placeholder: Messages.createEditModal.placeholders.type,
           disabled: isEditMode,
+          onChange: (event) => event.target.value.trim(),
         }}
       />
       <TextInput
diff --git a/ui/packages/ui-lib/src/form/inputs/text/text.tsx b/ui/packages/ui-lib/src/form/inputs/text/text.tsx
index 13cf6ff26..647b2d110 100644
--- a/ui/packages/ui-lib/src/form/inputs/text/text.tsx
+++ b/ui/packages/ui-lib/src/form/inputs/text/text.tsx
@@ -34,7 +34,20 @@ const TextInput = ({
             onWheel: (e) => {
               (e.target as HTMLElement).blur();
             },
-            ...textFieldProps?.inputProps,
+            onChange: (event: React.ChangeEvent<HTMLInputElement>) => {
+              if (textFieldProps?.onChange) {
+                const modifiedEvent = {
+                  ...event,
+                  target: {
+                    ...event.target,
+                    value: textFieldProps.onChange(event),
+                  },
+                };
+                field.onChange(modifiedEvent);
+              } else {
+                field.onChange(event);
+              }
+            },
           }}
           helperText={error ? error.message : textFieldProps?.helperText}
         />