diff --git a/assets/js/code-copy-button.js b/assets/js/code-copy-button.js
index 75848b3..71dc904 100644
--- a/assets/js/code-copy-button.js
+++ b/assets/js/code-copy-button.js
@@ -16,10 +16,18 @@ function createCopyButton(highlightDiv) {
 document.querySelectorAll(".highlight").forEach((highlightDiv) => createCopyButton(highlightDiv));
 
 async function copyCodeToClipboard(button, highlightDiv) {
-  // Need to get just the last-child of each .line element to avoid copying the line numbers
-  const nodeListToCopy = highlightDiv.querySelectorAll(":last-child > .chroma > code > .line > :last-child");
-  // Reduce the nodeList to a string of text with each line separated by a newline
-  const codeToCopy = Array.from(nodeListToCopy).reduce((accumulator, line) => accumulator + line.innerText, "");
+  // capture all code lines in the selected block which aren't classed `cmd_return`
+  let codeToCopy = highlightDiv.querySelectorAll(":last-child > .torchlight > code > .line:not(.cmd_return)");
+  // now remove the first-child of each line which has class `line-number`
+  codeToCopy = Array.from(codeToCopy).reduce((accumulator, line) => {
+    if (line.firstChild.className != "line-number") {
+      return accumulator + line.innerText + "\n"; }
+    else {
+      return accumulator + Array.from(line.children).filter(
+        (child) => child.className != "line-number").reduce(
+          (accumulator, child) => accumulator + child.innerText, "") + "\n";
+    }
+  }, "");
   try {
     var result = await navigator.permissions.query({ name: "clipboard-write" });
     if (result.state == "granted" || result.state == "prompt") {
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 784aa97..7898ca5 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -4,6 +4,6 @@
 <br><a target="_blank" href="https://github.com/jbowdre/runtimeterror">View source</a>.</p>
 
 {{ if (findRE "<pre" .Content 1) }}
-  <!-- {{ $jsCopy := resources.Get "js/code-copy-button.js" | minify }}
-  <script src="{{ $jsCopy.RelPermalink }}"></script> -->
+  {{ $jsCopy := resources.Get "js/code-copy-button.js" | minify }}
+  <script src="{{ $jsCopy.RelPermalink }}"></script>
 {{ end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 1f16216..7140f50 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -25,6 +25,6 @@
 {{ if (findRE "<pre" .Content 1) }}
   {{ $syntax := resources.Get "css/torchlight.css" | minify }}
   <link href="{{ $syntax.RelPermalink }}" rel="stylesheet">
-  <!-- {{ $copyCss := resources.Get "css/code-copy-button.css" | minify }}
-  <link href="{{ $copyCss.RelPermalink }}" rel="stylesheet"> -->
+  {{ $copyCss := resources.Get "css/code-copy-button.css" | minify }}
+  <link href="{{ $copyCss.RelPermalink }}" rel="stylesheet">
 {{ end }}