diff --git a/web/pgadmin/static/js/components/FormComponents.jsx b/web/pgadmin/static/js/components/FormComponents.jsx
index 6fe35d3fc..dc78e5729 100644
--- a/web/pgadmin/static/js/components/FormComponents.jsx
+++ b/web/pgadmin/static/js/components/FormComponents.jsx
@@ -919,7 +919,8 @@ export const InputSelect = forwardRef(({
       Option: CustomSelectOption,
       SingleValue: CustomSelectSingleValue,
       IndicatorSeparator: (props) => controlProps.noDropdown ? null: <RSComponents.IndicatorSeparator {...props} />,
-      DropdownIndicator: (props) => controlProps.noDropdown ? null: <RSComponents.DropdownIndicator {...props} />
+      DropdownIndicator: (props) => controlProps.noDropdown ? null: <RSComponents.DropdownIndicator {...props} />,
+      Input: props => <RSComponents.Input {...props} maxLength={controlProps.maxLength} />
     },
     isMulti: Boolean(controlProps.multiple),
     openMenuOnClick: !readonly,
diff --git a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
index d6af5275b..3da4a2467 100644
--- a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
+++ b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
@@ -197,6 +197,7 @@ def register_query_tool_preferences(self):
             'allowClear': False,
             'tags': False,
             'creatable': True,
+            'maxLength': 1
         }
     )
 
@@ -212,6 +213,7 @@ def register_query_tool_preferences(self):
             'allowClear': False,
             'tags': False,
             'creatable': True,
+            'maxLength': 1
         }
     )