diff --git a/ChangeLog b/ChangeLog
index b27d7db09..3bc26103b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 - patch #3304473 [setup] Redefine a lable that was wrong
 - bug #3304544 [parser] master is not a reserved word
 - bug #3307616 [edit] Inline edit updates multiple duplicate rows
+- patch #3311539 [edit] Inline edit does not escape backslashes
 
 3.4.2.0 (not yet released)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/js/sql.js b/js/sql.js
index 739e5d1c3..73a2b78e3 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -944,6 +944,8 @@ $(document).ready(function() {
 
         //Remove the last ',' appended in the above loop
         sql_query = sql_query.replace(/,\s$/, '');
+        //Fix non-escaped backslashes
+        sql_query = sql_query.replace(/\\/g, '\\\\');
         new_clause = new_clause.substring(0, new_clause.length-5);
         new_clause = PMA_urlencode(new_clause);
         sql_query += ' WHERE ' + PMA_urldecode(where_clause);