diff --git a/ChangeLog b/ChangeLog
index 3f04129844..bde9d37c04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,7 @@ phpMyAdmin - ChangeLog
 - bug #3482734 [interface] No warning on syntax error in search form 
 - bug #3423717 [core] Improved detection of SSL connection
 + FULLTEXT support for InnoDB, starting with MySQL 5.6.4
+- bug #3497151 [interface] Duplicate inline query edit box
 
 3.4.11.0 (not yet released)
 - bug #3486970 [import] Exception on XML import
diff --git a/js/functions.js b/js/functions.js
index d07410037e..abb986ff78 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1057,6 +1057,12 @@ function pdfPaperSize(format, axis)
  */
 $(document).ready(function(){
     $(".inline_edit_sql").live('click', function(){
+        if ($('#sql_query_edit').length) {
+            // An inline query editor is already open,
+            // we don't want another copy of it
+            return false;
+        }
+
         var $form = $(this).prev();
         var sql_query  = $form.find("input[name='sql_query']").val();
         var $inner_sql = $(this).parent().prev().find('.inner_sql');