diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ff992bfc..822289bb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -260,6 +260,7 @@ export function jwtOptionsFactory() {
     provideDynamicHooks({
       parsers: [
         { component: CtrComponent, unescapeStrings: false },
+        { component: CopyToClipboardComponent, unescapeStrings: false },
         { component: GlossaryMdComponent, unescapeStrings: false },
         { component: MermaidMdComponent, unescapeStrings: false },
         { component: HiddenMdComponent, unescapeStrings: false },
diff --git a/src/app/hf-markdown/hf-markdown.component.ts b/src/app/hf-markdown/hf-markdown.component.ts
index 62bc9d0d..15976089 100644
--- a/src/app/hf-markdown/hf-markdown.component.ts
+++ b/src/app/hf-markdown/hf-markdown.component.ts
@@ -98,7 +98,7 @@ ${token}`;
         ctrId="${id}"
         filename="${filepath}"
         title="Click to create ${filepath} on ${target}"
-      >${this.renderHighlightedCode(code, language, filename)}</ctr>`;
+      >${this.renderHighlightedCode(code, language, filename, false)}</ctr>`;
     },
 
     mermaid(code: string) {
@@ -147,10 +147,17 @@ ${token}`;
     code: string,
     language: string,
     fileName?: string,
+    copyCode: boolean = true,
   ) {
+    let copyCodeDiv = '';
+    if (copyCode) {
+      const id = this.ctrService.registerCode(code);
+      copyCodeDiv = `<app-copy-to-clipboard ctrId='${id}'></app-copy-to-clipboard>`;
+    }
+
     const fileNameTag = fileName
-      ? `<p class="filename" (click)=createFile(code,node)>${fileName}</p>`
-      : `<p class="language">${language}</p>`;
+      ? `<p class="filename" (click)=createFile(code,node)>${fileName} ${copyCodeDiv}</p>`
+      : `<p class="language">${language} ${copyCodeDiv}</p>`;
     const classAttr = `language-${language}`;
 
     if (Prism.languages[language]) {