diff --git a/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py b/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py
index ed60f1e9..2ff18d83 100644
--- a/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py
+++ b/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py
@@ -37,20 +37,25 @@ def is_query_resultset_updatable(conn, sql_path):
 
     # First check that all the columns belong to a single table
     table_oid = columns_info[0]['table_oid']
-    column_numbers = []
+    columns = []
     for column in columns_info:
         if column['table_oid'] != table_oid:
             return False, None, None, None
         else:
-            column_numbers.append(column['table_column'])
+            columns.append({
+                'display_name': column['display_name'],
+                'column_number': column['table_column']
+            })
 
     # Check for duplicate columns
+    column_numbers = [col['column_number'] for col in columns]
     is_duplicate_columns = len(column_numbers) != len(set(column_numbers))
     if is_duplicate_columns:
         return False, None, None, None
 
     if conn.connected():
         # Then check that all the primary keys of the table are present
+        # and no primary keys are renamed (or other columns renamed to be like primary keys)
         query = render_template(
             "/".join([sql_path, 'primary_keys.sql']),
             obj_id=table_oid
@@ -59,21 +64,36 @@ def is_query_resultset_updatable(conn, sql_path):
         if not status:
             return False, None, None, None
 
-        primary_keys_column_numbers = []
+        primary_keys_columns = []
         primary_keys = OrderedDict()
         pk_names = []
 
         for row in result['rows']:
             primary_keys[row['attname']] = row['typname']
-            primary_keys_column_numbers.append(row['attnum'])
+            primary_keys_columns.append({
+                'name': row['attname'],
+                'column_number': row['attnum']
+            })
             pk_names.append(row['attname'])
 
-        all_primary_keys_exist = all(elem in column_numbers
-                                     for elem in primary_keys_column_numbers)
-    else:
-        return False, None, None, None
+        # Check that all primary keys exist and that all of them are not renamed
+        # and other columns are not renamed to primary key names
+        for pk in primary_keys_columns:
+            pk_exists = False
+            for col in columns:
+                if col['column_number'] == pk['column_number']:
+                    pk_exists = True
+                    if col['display_name'] != pk['name']:  # If the primary key column is renamed
+                        return False, None, None, None
+                # If the column is not the primary key but it is renamed to its name
+                elif col['display_name'] == pk['name']:
+                    return False, None, None, None
+
+            if not pk_exists:
+                return False, None, None, None
 
-    if all_primary_keys_exist:
+        # If the for loop exited without returning from the function then
+        # all primary keys exist without being renamed
         return True, primary_keys, pk_names, table_oid
     else:
         return False, None, None, None