diff --git a/docs/en_US/function_dialog.rst b/docs/en_US/function_dialog.rst
index c01d693f1..6be636ecb 100644
--- a/docs/en_US/function_dialog.rst
+++ b/docs/en_US/function_dialog.rst
@@ -39,6 +39,8 @@ Use the fields in the *Definition* tab to define the function:
 * Use the drop-down listbox next to *Return type* to select the data type
   returned by the function, if any. If *Custom return type?* is enabled this field
   will change to an input text field.
+* Move the *Returns a set?* switch to indicate if the function returns a set
+  that includes multiple rows. The default is *No*.
 * Use the drop-down listbox next to *Language* to select the implementation
   language. The default is *sql*.
 * Use the drop-down listbox next to *Depends on extensions* to select the extension that this function
@@ -88,8 +90,6 @@ function:
     * *IMMUTABLE* indicates that the function cannot modify the database and
       always returns the same result when given the same argument values.
 
-* Move the *Returns a Set?* switch to indicate if the function returns a set
-  that includes multiple rows. The default is *No*.
 * Move the *Strict?* switch to indicate if the function always returns NULL
   whenever any of its arguments are NULL. If *Yes*, the function is not executed
   when there are NULL arguments; instead a NULL result is assumed
diff --git a/docs/en_US/images/function_definition.png b/docs/en_US/images/function_definition.png
index 49ac8a63b..20f4a58aa 100644
Binary files a/docs/en_US/images/function_definition.png and b/docs/en_US/images/function_definition.png differ
diff --git a/docs/en_US/images/function_options.png b/docs/en_US/images/function_options.png
index 595cc5acd..513c5964a 100644
Binary files a/docs/en_US/images/function_options.png and b/docs/en_US/images/function_options.png differ
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
index 1e57e9d92..32096c19c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
@@ -265,6 +265,10 @@ export default class FunctionSchema extends BaseUISchema {
       id: 'prorettypename', label: gettext('Return type'), cell: 'string',
       type: 'text', group: gettext('Definition'),
       mode: ['properties', 'edit'], readonly: obj.isReadonly, visible: obj.isVisible,
+    },{
+      id: 'proretset', label: gettext('Returns a set?'), type: 'switch',
+      disabled: ()=>{return !obj.isNew();}, group: gettext('Definition'),
+      visible: obj.isVisible, readonly: obj.isReadonly,
     },{
       id: 'lanname', label: gettext('Language'), cell: 'string', noEmpty: true,
       options: this.fieldOptions.getLanguage, type: 'select', group: gettext('Definition'),
@@ -332,10 +336,6 @@ export default class FunctionSchema extends BaseUISchema {
         {'label': 'IMMUTABLE', 'value': 'i'},
       ], disabled: (this.type !== 'procedure') ? obj.inCatalog() : obj.isLessThan95ORNonSPL,
       controlProps: {allowClear: false},
-    },{
-      id: 'proretset', label: gettext('Returns a set?'), type: 'switch',
-      disabled: ()=>{return !obj.isNew();}, group: gettext('Options'),
-      visible: obj.isVisible, readonly: obj.isReadonly,
     },{
       id: 'proisstrict', label: gettext('Strict?'), type: 'switch',
       group: gettext('Options'),