diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
index 1ad7c5770..136d68d0d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
@@ -97,9 +97,6 @@ export default class ViewSchema extends BaseUISchema {
       type: 'sql', mode: ['create', 'edit'], group: gettext('Code'),
       isFullTab: true,
       disabled: obj.notInSchema,
-      controlProps: {
-        className: ['sql-code-control'],
-      },
     },
 
     {
@@ -117,7 +114,6 @@ export default class ViewSchema extends BaseUISchema {
       editable: false, type: 'collection',
       canEdit: false, group: gettext('Security'), canDelete: true,
       mode: ['edit', 'create'], canAdd: true,
-      control: 'unique-col-collection',
       uniqueCol : ['provider'],
     }
     ];
diff --git a/web/pgadmin/static/js/components/Buttons.jsx b/web/pgadmin/static/js/components/Buttons.jsx
index 981f90246..4c9c14b54 100644
--- a/web/pgadmin/static/js/components/Buttons.jsx
+++ b/web/pgadmin/static/js/components/Buttons.jsx
@@ -92,9 +92,11 @@ export const PgIconButton = forwardRef(({icon, title, className, ...props}, ref)
   /* Tooltip does not work for disabled items */
   return (
     <Tooltip title={title || ''} aria-label={title || ''}>
-      <DefaultButton ref={ref} style={{minWidth: 0}} className={clsx(classes.iconButton, className)} {...props}>
-        {icon}
-      </DefaultButton>
+      <span>
+        <DefaultButton ref={ref} style={{minWidth: 0}} className={clsx(classes.iconButton, className)} {...props}>
+          {icon}
+        </DefaultButton>
+      </span>
     </Tooltip>
   );
 });
diff --git a/web/pgadmin/static/js/components/FormComponents.jsx b/web/pgadmin/static/js/components/FormComponents.jsx
index fcca88579..d67907604 100644
--- a/web/pgadmin/static/js/components/FormComponents.jsx
+++ b/web/pgadmin/static/js/components/FormComponents.jsx
@@ -392,7 +392,7 @@ export function InputToggle({cid, value, onChange, options, disabled, readonly,
           const isSelected = option.value === value;
           const isDisabled = disabled || (readonly && isSelected);
           return (
-            <ToggleButton key={option.label} value={option.value || ''} component={isSelected ? PrimaryButton : DefaultButton}
+            <ToggleButton key={option.label} value={option.value} component={isSelected ? PrimaryButton : DefaultButton}
               disabled={isDisabled} aria-label={option.label}>
               <CheckRoundedIcon style={{visibility: isSelected ? 'visible': 'hidden'}}/>&nbsp;{option.label}
             </ToggleButton>
diff --git a/web/regression/javascript/schema_ui_files/language.ui.spec.js b/web/regression/javascript/schema_ui_files/language.ui.spec.js
index 5ba43a9d9..163c07ede 100644
--- a/web/regression/javascript/schema_ui_files/language.ui.spec.js
+++ b/web/regression/javascript/schema_ui_files/language.ui.spec.js
@@ -114,10 +114,13 @@ describe('LanguageSchema', ()=>{
     let state = {};
     let setError = jasmine.createSpy('setError');
 
-    state.lanproc = null;
+    state.lanproc = '';
     schemaObj.validate(state, setError);
     expect(setError).toHaveBeenCalledWith('lanproc', 'Handler function cannot be empty.');
 
+    state.lanproc = 'my_len';
+    schemaObj.validate(state, setError);
+    expect(setError).toHaveBeenCalledWith('lanproc', null);
   });
 });