diff --git a/ChangeLog b/ChangeLog
index 927bd751c3..0698f36433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 + [import] Remove support for the unactive docSQL import format
 - bug #3577443 [edit] "Browse foreign values" does not show on ajax edit
 + rfe #3522109 [browse] Grid editing: action to trigger it (or disable)
+- bug #3578776 [search] Editing SQL not possible when no records found
 
 3.5.4.0 (not yet released)
 - bug #3570212 [edit] uuid_short() is a no-arguments function
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 85cf9d3ab5..ce8354f72e 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -97,9 +97,12 @@ $(function() {
         $.post($search_form.attr('action'), values, function(data) {
             PMA_ajaxRemoveMessage($msgbox);
             if (data.success == true) {
-                // found results
-                $("#sqlqueryresults").html(data.message);
-                $("#sqlqueryresults").trigger('makegrid');
+                if (data.sql_query != null) { // zero rows
+                    $("#sqlqueryresults").html(data.sql_query);
+                } else { // results found
+                    $("#sqlqueryresults").html(data.message);
+                    $("#sqlqueryresults").trigger('makegrid');
+                }
                 $('#tbl_search_form')
                 // workaround for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.
                  .slideToggle()