diff --git a/docs/en_US/images/function_definition.png b/docs/en_US/images/function_definition.png
index 353874656e760d632c96a346151767c2f957a4b1..169468bd90471ed16710818234ebe1ae951bd458 100644
GIT binary patch
diff --git a/docs/en_US/images/procedure_arguments.png b/docs/en_US/images/procedure_arguments.png
deleted file mode 100755
index 0f09b788c39ff636874f38faa3133eff764c0ad9..0000000000000000000000000000000000000000
GIT binary patch
diff --git a/docs/en_US/images/procedure_definition.png b/docs/en_US/images/procedure_definition.png
old mode 100755
new mode 100644
index 7bcb61eba00153491782bd9d121e308562d0370e..28b6ac55220dd682617f9d051839555805b32457
GIT binary patch
diff --git a/docs/en_US/procedure_dialog.rst b/docs/en_US/procedure_dialog.rst
index 5f33d6e40..37befbd37 100644
--- a/docs/en_US/procedure_dialog.rst
+++ b/docs/en_US/procedure_dialog.rst
@@ -36,6 +36,21 @@ Use the fields in the *Definition* tab to define the procedure:
 
 * Use the drop-down listbox next to *Language* to select a language. The default
   is *edbspl*.
+* Use the fields in the *Arguments* section to define an argument. Click *Add* to set
+parameters and values for the argument:
+* Use the drop-down listbox next to *Data type* to select a data type.
+* Use the drop-down listbox next to *Mode* to select a mode. Select *IN* for an
+  input parameter; select *OUT* for an output parameter; select *INOUT* for both
+  an input and an output parameter; or, select *VARIADIC* to specify a VARIADIC
+  parameter.
+* Write a name for the argument in the *Argument Name* field.
+* Specify a default value for the argument in the *Default Value* field.
+
+Click *Add* to define another argument; to discard an argument, click the trash
+icon to the left of the row and confirm deletion in the *Delete Row* popup.
+
+Click the *Code* tab to continue.
+
 * Use the *Code* field to specify the code that will execute when the procedure
   is called.
 
@@ -73,26 +88,6 @@ procedure:
   effects — it reveals no information about its arguments other than by its
   return value. The default is *No*.
 
-Click the *Arguments* tab to continue.
-
-.. image:: images/procedure_arguments.png
-    :alt: Procedure dialog arguments tab
-    :align: center
-
-Use the fields in the *Arguments* tab to define an argument. Click *Add* to set
-parameters and values for the argument:
-
-* Use the drop-down listbox next to *Data type* to select a data type.
-* Use the drop-down listbox next to *Mode* to select a mode. Select *IN* for an
-  input parameter; select *OUT* for an output parameter; select *INOUT* for both
-  an input and an output parameter; or, select *VARIADIC* to specify a VARIADIC
-  parameter.
-* Write a name for the argument in the *Argument Name* field.
-* Specify a default value for the argument in the *Default Value* field.
-
-Click *Add* to define another argument; to discard an argument, click the trash
-icon to the left of the row and confirm deletion in the *Delete Row* popup.
-
 Click the *Parameters* tab to continue.
 
 .. image:: images/procedure_parameters.png
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
index 1afdecf14..e6c76eb5d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
@@ -58,6 +58,9 @@ define('pgadmin.node.function', [
     },{
       id: 'argmode', label: gettext('Mode'), type: 'options',
       control: 'node-ajax-options', cellHeaderClasses:'width_percent_20',
+      cell: 'node-ajax-options', select2: {
+        allowClear: false,
+      },
       options:[
         {'label': 'IN', 'value': 'IN'},
         {'label': 'OUT', 'value': 'OUT'},
