diff --git a/ChangeLog b/ChangeLog
index bf0390260..a757acbcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -144,6 +144,7 @@
 - rfe #2936155 [auth] Allow to pass additional parameters using signon method.
 - rfe #1640812 [auth] Add example for OpenID authentication using signon method.
 - rfe #1312657 [dbi] Default to mysqli extension.
+- rfe #1168350 [interface] Add clear button to SQL edit box.
 
 3.3.10.0 (not yet released)
 - patch #3147400 [structure] Aria table size printed as unknown,
diff --git a/js/functions.js b/js/functions.js
index f1542dd35..eae4b271b 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1052,6 +1052,8 @@ function insertQuery(queryType) {
         query = "UPDATE `" + table + "` SET " + editDis + " WHERE 1";
     } else if(queryType == "delete") {
         query = "DELETE FROM `" + table + "` WHERE 1";
+    } else if(queryType == "clear") {
+        query = '';
     }
     document.sqlform.sql_query.value = query;
     sql_box_locked = false;
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 043532593..9852e0aec 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -294,6 +294,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
         echo '<input type="button" value="UPDATE" id="update" class="sqlbutton" />';
         echo '<input type="button" value="DELETE" id="delete" class="sqlbutton" />';
     }
+    echo '<input type="button" value="' . __('Clear') . '" id="clear" class="sqlbutton" />';
     echo '</div>' . "\n";
 
     if (count($fields_list)) {