diff --git a/migration/i7.1z/oracle/202006011511_IDEMPIERE-4315.sql b/migration/i7.1z/oracle/202006011511_IDEMPIERE-4315.sql
new file mode 100644
index 0000000000..7803c8442c
--- /dev/null
+++ b/migration/i7.1z/oracle/202006011511_IDEMPIERE-4315.sql
@@ -0,0 +1,27 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-4315 Allow showing Change Log for extension tables
+-- Jun 1, 2020, 3:09:46 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_DATE('2020-06-01 15:09:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=227
+;
+
+-- Jun 1, 2020, 3:09:52 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_DATE('2020-06-01 15:09:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=228
+;
+
+-- Jun 1, 2020, 3:09:57 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_DATE('2020-06-01 15:09:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=103
+;
+
+-- Jun 1, 2020, 3:10:01 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_DATE('2020-06-01 15:10:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=315
+;
+
+-- Jun 1, 2020, 3:10:06 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_DATE('2020-06-01 15:10:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=266
+;
+
+SELECT register_migration_script('202006011511_IDEMPIERE-4315.sql') FROM dual
+;
+
diff --git a/migration/i7.1z/postgresql/202006011511_IDEMPIERE-4315.sql b/migration/i7.1z/postgresql/202006011511_IDEMPIERE-4315.sql
new file mode 100644
index 0000000000..4f0d2c91a6
--- /dev/null
+++ b/migration/i7.1z/postgresql/202006011511_IDEMPIERE-4315.sql
@@ -0,0 +1,24 @@
+-- IDEMPIERE-4315 Allow showing Change Log for extension tables
+-- Jun 1, 2020, 3:09:46 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_TIMESTAMP('2020-06-01 15:09:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=227
+;
+
+-- Jun 1, 2020, 3:09:52 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_TIMESTAMP('2020-06-01 15:09:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=228
+;
+
+-- Jun 1, 2020, 3:09:57 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_TIMESTAMP('2020-06-01 15:09:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=103
+;
+
+-- Jun 1, 2020, 3:10:01 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_TIMESTAMP('2020-06-01 15:10:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=315
+;
+
+-- Jun 1, 2020, 3:10:06 PM CEST
+UPDATE AD_Table SET IsChangeLog='Y',Updated=TO_TIMESTAMP('2020-06-01 15:10:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=266
+;
+
+SELECT register_migration_script('202006011511_IDEMPIERE-4315.sql') FROM dual
+;
+
diff --git a/org.adempiere.base/src/org/compiere/model/GridTab.java b/org.adempiere.base/src/org/compiere/model/GridTab.java
index 43bd65cfb3..cdcb538cb5 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTab.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTab.java
@@ -2382,7 +2382,15 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 		e.CreatedBy = (Integer)getValue("CreatedBy");
 		e.Updated = (Timestamp)getValue("Updated");
 		e.UpdatedBy = (Integer)getValue("UpdatedBy");
-		e.Record_ID = getValue(m_keyColumnName);
+		if (   e.AD_Table_ID == I_AD_OrgInfo.Table_ID
+			|| e.AD_Table_ID == I_AD_ClientInfo.Table_ID
+			|| e.AD_Table_ID == I_AD_Ref_Table.Table_ID
+			|| e.AD_Table_ID == I_C_AcctSchema_Default.Table_ID
+			|| e.AD_Table_ID == I_C_AcctSchema_GL.Table_ID) {
+			e.Record_ID = getValue(m_parents.get(0));
+		} else {
+			e.Record_ID = getValue(m_keyColumnName);
+		}
 		//  Info
 		StringBuilder info = new StringBuilder(getTableName());