diff --git a/ChangeLog b/ChangeLog
index b5ad88270..bd2efd73a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2887357 [core] Slow loading times with large databases (partial fix) 
 - bug #2893931 [lang] Typo and empty message 
 + [lang] Russian update, thanks to Victor Volkov 
+- bug #2823599 [edit] UUID Primary Key wrongly updated
 
 3.2.3.0 (2009-10-30)
 - patch #2856664 [export] Date, time, and datetime column types now export correctly to
diff --git a/tbl_change.php b/tbl_change.php
index 391849f73..77cb24cf8 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -525,8 +525,12 @@ foreach ($rows as $row_id => $vrow) {
                     $default_function = $cfg['DefaultFunctions']['first_timestamp'];
                 }
 
-                if ($field['Key'] == 'PRI'
-                 && ($field['Type'] == 'char(36)' || $field['Type'] == 'varchar(36)')) {
+                // For primary keys of type char(36) or varchar(36) UUID if the default function
+                // Only applies to insert mode, as it would silently trash data on updates.
+                if ($insert_mode
+                    && $field['Key'] == 'PRI'
+                    && ($field['Type'] == 'char(36)' || $field['Type'] == 'varchar(36)')
+                ) {
                      $default_function = $cfg['DefaultFunctions']['pk_char36'];
                 }