diff --git a/ChangeLog b/ChangeLog
index 46a7f1c00..e5064bcb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2983065 [operations] Error when changing from Maria to MyISAM engine
 - bug #2975408 [tracking] Data too long for column data_sql
 - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL 
+- bug [edit] Avoid selecting UNHEX function by default for a BLOB column for
+  which editing is protected
 
 3.3.2.0 (2010-04-13)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/tbl_change.php b/tbl_change.php
index f8cc1c0cf..d7b86dd60 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -482,7 +482,7 @@ foreach ($rows as $row_id => $vrow) {
             $backup_field  = '';
             $special_chars_encoded = PMA_duplicateFirstNewline($special_chars);
             // this will select the UNHEX function while inserting
-            if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
+            if (($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
                 $field['display_binary_as_hex'] = true;
             }
         }