diff --git a/docs/en_US/release_notes_7_2.rst b/docs/en_US/release_notes_7_2.rst
index 0a88321ad..fda2c6ebe 100644
--- a/docs/en_US/release_notes_7_2.rst
+++ b/docs/en_US/release_notes_7_2.rst
@@ -32,6 +32,7 @@ Housekeeping
 Bug fixes
 *********
 
+  | `Issue #5789 <https://github.com/pgadmin-org/pgadmin4/issues/5789>`_ -  Fixed an issue where Foreign Key columns are shown in the wrong order in SQL and Properties.
   | `Issue #5817 <https://github.com/pgadmin-org/pgadmin4/issues/5817>`_ -  Ensure that a new row should be added on top in the User Management dialog.
   | `Issue #5926 <https://github.com/pgadmin-org/pgadmin4/issues/5926>`_ -  Fixed an issue where REVOKE ALL DDL in table SQL was added only for one role.
   | `Issue #6003 <https://github.com/pgadmin-org/pgadmin4/issues/6003>`_ -  Indicate the user if all the server's children nodes are hidden from the preferences setting.
@@ -42,8 +43,10 @@ Bug fixes
   | `Issue #6147 <https://github.com/pgadmin-org/pgadmin4/issues/6147>`_ -  Heartbeat is getting logged, though no server is connected in pgAdmin.
   | `Issue #6204 <https://github.com/pgadmin-org/pgadmin4/issues/6204>`_ -  Ensure that name can't be empty in edit mode for Primary Key and Index.
   | `Issue #6221 <https://github.com/pgadmin-org/pgadmin4/issues/6221>`_ -  Fix circular reference error for the multirange data types in the query tool.
+  | `Issue #6247 <https://github.com/pgadmin-org/pgadmin4/issues/6247>`_ -  Fixed an issue where PSQL tool prompts for password if using password exec command.
   | `Issue #6253 <https://github.com/pgadmin-org/pgadmin4/issues/6253>`_ -  Fix an issue in the register server when setting the role, an arbitrary SQL query can be fired.
   | `Issue #6267 <https://github.com/pgadmin-org/pgadmin4/issues/6267>`_ -  Ensure the user is able to log in if the specified OAUTH2_USERNAME_CLAIM is present in the OAuth2 profile.
   | `Issue #6278 <https://github.com/pgadmin-org/pgadmin4/issues/6278>`_ -  Use dependent instead of dependant in the message.
+  | `Issue #6279 <https://github.com/pgadmin-org/pgadmin4/issues/6279>`_ -  Fix incorrect number of foreign tables displayed. Show column comments in RE-SQL.
   | `Issue #6280 <https://github.com/pgadmin-org/pgadmin4/issues/6280>`_ -  View SQL tab not quoting column comments.
   | `Issue #6281 <https://github.com/pgadmin-org/pgadmin4/issues/6281>`_ -  VarChar Field Sizes are missing from Query's Grid header.
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/default/get_constraint_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/default/get_constraint_cols.sql
index 508cb295a..1e8d2c508 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/default/get_constraint_cols.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/default/get_constraint_cols.sql
@@ -3,7 +3,8 @@
 UNION
 {% endif %}
 SELECT a1.attname as conattname,
-    a2.attname as confattname
+    a2.attname as confattname,
+    a1.attnum as attnum
 FROM pg_catalog.pg_attribute a1,
     pg_catalog.pg_attribute a2
 WHERE a1.attrelid={{tid}}::oid
@@ -11,3 +12,4 @@ WHERE a1.attrelid={{tid}}::oid
     AND a2.attrelid={{confrelid}}::oid
     AND a2.attnum={{keypair[0]}}
 {% endfor %}
+ORDER BY attnum;