diff --git a/dev/vscode-collapsible/actions-stop-propagation.html b/dev/vscode-collapsible/actions-stop-propagation.html
new file mode 100644
index 000000000..7d7525d67
--- /dev/null
+++ b/dev/vscode-collapsible/actions-stop-propagation.html
@@ -0,0 +1,64 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>VSCode Elements</title>
+    <link
+      rel="stylesheet"
+      href="/node_modules/@vscode/codicons/dist/codicon.css"
+      id="vscode-codicon-stylesheet"
+    >
+    <script
+      type="module"
+      src="/node_modules/@vscode-elements/webview-playground/dist/index.js"
+    ></script>
+    <script type="module" src="/dist/main.js"></script>
+    <script>
+      const logEvents = (selector, eventType) => {
+        document.querySelector(selector).addEventListener(eventType, (ev) => {
+          console.log(ev);
+        });
+      };
+    </script>
+  </head>
+
+  <body>
+    <h1>Component demo</h1>
+    <main>
+      <vscode-demo>
+        <vscode-collapsible
+          always-show-header-actions
+          heading="Test"
+          style="display: block; width: 500px"
+        >
+          <vscode-icon
+            name="file-add"
+            action-icon
+            aria-role="button"
+            id="btn-file-add"
+            title="New File"
+            slot="actions"
+          ></vscode-icon>
+          <vscode-icon
+            name="refresh"
+            action-icon
+            aria-role="button"
+            id="btn-refresh"
+            title="Refresh"
+            slot="actions"
+          ></vscode-icon>
+          <p>Lorem ipsum</p>
+          <p>Lorem ipsum</p>
+          <p>Lorem ipsum</p>
+          <p>Lorem ipsum</p>
+          <p>Lorem ipsum</p>
+        </vscode-collapsible>
+      </vscode-demo>
+      <script>
+        logEvents('#btn-file-add', 'click');
+        logEvents('#btn-refresh', 'click');
+      </script>
+    </main>
+  </body>
+</html>
diff --git a/src/vscode-collapsible/vscode-collapsible.test.ts b/src/vscode-collapsible/vscode-collapsible.test.ts
index fb7679ef2..f99e4f47f 100644
--- a/src/vscode-collapsible/vscode-collapsible.test.ts
+++ b/src/vscode-collapsible/vscode-collapsible.test.ts
@@ -1,4 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+import {$, clickOnElement} from '../includes/test-helpers.js';
 import {VscodeCollapsible} from './index.js';
+import '../vscode-icon/index.js';
 import {expect, fixture, html} from '@open-wc/testing';
 
 describe('vscode-collapsible', () => {
@@ -104,4 +107,17 @@ describe('vscode-collapsible', () => {
 
     expect(detail).to.deep.equal({open: true});
   });
+
+  it('prevents collapse on action icon click', async () => {
+    const el = await fixture<VscodeCollapsible>(html`
+      <vscode-collapsible always-show-header-actions open
+        ><vscode-icon name="file" slot="actions" id="action-icon"></vscode-icon>
+      </vscode-collapsible>
+    `);
+
+    const actionIcon = $('#action-icon');
+    await clickOnElement(actionIcon);
+
+    expect(el.open).to.be.true;
+  });
 });
diff --git a/src/vscode-collapsible/vscode-collapsible.ts b/src/vscode-collapsible/vscode-collapsible.ts
index 3363f2ce3..64095ee57 100644
--- a/src/vscode-collapsible/vscode-collapsible.ts
+++ b/src/vscode-collapsible/vscode-collapsible.ts
@@ -84,6 +84,10 @@ export class VscodeCollapsible extends VscElement {
     }
   }
 
+  private _onActionClick(event: PointerEvent) {
+    event.stopPropagation();
+  }
+
   override render(): TemplateResult {
     const classes = {collapsible: true, open: this.open};
     const actionsClasses = {
@@ -123,7 +127,7 @@ export class VscodeCollapsible extends VscElement {
           <h3 class="title">${heading}${descriptionMarkup}</h3>
           <div class="header-slots">
             <div class=${classMap(actionsClasses)}>
-              <slot name="actions"></slot>
+              <slot name="actions" @click=${this._onActionClick}></slot>
             </div>
             <div class="decorations"><slot name="decorations"></slot></div>
           </div>
