diff --git a/ChangeLog b/ChangeLog
index e19ba9252..f96fc7024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1679055 #1050 - Table '<table name>' already exists
 - patch #1681620 [interface] support reordering of $cfg['ColumnTypes'],
   thanks to Leonard den Ottolander
+- bug #1690718 Can't edit if BLOB and no PK
 
 2.10.0.3 (not released yet)
 =====================
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index b89181c75..aa2ab1d8a 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1927,6 +1927,9 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
                             $condition .= '= CAST(0x' . bin2hex($row[$i])
                                 . ' AS BINARY) AND';
                         }
+                    } else {
+                        // this blob won't be part of the final condition
+                        $condition = '';
                     }
             } else {
                 $condition .= '= \''
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 0347b09fe..6124a61a1 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1072,6 +1072,11 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
         // 1. Prepares the row (gets primary keys to use)
         // 1.1 Results from a "SELECT" statement -> builds the
         //     "primary" key to use in links
+        /**
+         * @todo $unique_condition could be empty, for example a table
+         *       with only one field and it's a BLOB; in this case,
+         *       avoid to display the delete and edit links
+         */
         $unique_condition     = urlencode(PMA_getUniqueCondition($dt_result, $fields_cnt, $fields_meta, $row));
 
         // 1.2 Defines the urls for the modify/delete link(s)