diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 3b380035..34bc5d67 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -649,7 +649,7 @@ class Adminer {
 		}
 		$history[$_GET["db"]][] = array($query, time(), $time); // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"]
 		$sql_id = "sql-" . count($history[$_GET["db"]]);
-		$return = "<a href='#$sql_id' class='toggle'>" . lang('SQL command') . "</a>\n";
+		$return = "<a href='#$sql_id' class='toggle'>" . lang('SQL command') . "</a> <a href='#' class='copy-to-clipboard icon expand' data-expand-id='$sql_id'></a>\n";
 		if (!$failed && ($warnings = $driver->warnings())) {
 			$id = "warnings-" . count($history[$_GET["db"]]);
 			$return = "<a href='#$id' class='toggle'>" . lang('Warnings') . "</a>, $return<div id='$id' class='hidden'>\n$warnings</div>\n";
diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 2eb2473d..65ab98b3 100644
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -873,6 +873,9 @@ function setupCopyToClipboard(document) {
 				nodeSql = document.querySelector("textarea.sqlarea");
 			}
 			if (nodeSql != null && nodeSql != undefined) {
+				if (node.classList.contains('expand')) {
+					document.getElementById(node.getAttribute('data-expand-id')).classList.remove("hidden");
+				}
 				copyToClipboard(nodeSql);
 			}
 		});
@@ -883,6 +886,7 @@ function setupCopyToClipboard(document) {
  * @param HTMLElement
  */
 function copyToClipboard(el) {
+
 	var nodeName = el.nodeName.toLowerCase();
 	if (nodeName == 'code') {
 		var range = document.createRange();