diff --git a/src/CollapsableExtLink.ts b/src/CollapsableExtLink.ts
index de4966a..cc6ca18 100644
--- a/src/CollapsableExtLink.ts
+++ b/src/CollapsableExtLink.ts
@@ -74,6 +74,7 @@ export class CollapsableExtLink {
 			this.extLink.removeEventListener('click', this.listener)
 			this.extLink.removeAttribute('aria-controls')
 			this.extLink.removeAttribute(this.ariaPerRole)
+			this.extLink.removeAttribute('role')
 		}
 	}
 }
diff --git a/src/CollapsableItem.ts b/src/CollapsableItem.ts
index 0dae07f..a085013 100644
--- a/src/CollapsableItem.ts
+++ b/src/CollapsableItem.ts
@@ -17,7 +17,7 @@ type ListenersMapItem = {
 
 type CollapsableElementListeners = {
 	eventName: CollapsableItemEvents
-	listener: EventListener
+	listener: (event: CollapsableEvent) => void
 }
 
 export interface HTMLCollapsableItem extends HTMLElement {
@@ -121,6 +121,7 @@ export class CollapsableItem {
 
 	private addHandlers(): void {
 		const { options } = this.collapsable
+		const collapsableElement = this.element
 		const interactiveElementsListener = (event: CustomEvent) => {
 			const passEvent = event.detail.collapsableEvent ?? event
 
@@ -137,19 +138,39 @@ export class CollapsableItem {
 		const collapsableListeners: CollapsableElementListeners[] = [
 			{
 				eventName: 'expand.collapsable',
-				listener: () => this.boxElements.forEach((box) => (box.dataset.collapsableState = 'expanding'))
+				listener: (event: CollapsableEvent) => {
+					if (event.target !== collapsableElement) {
+						return
+					}
+					this.boxElements.forEach((box) => (box.dataset.collapsableState = 'expanding'))
+				}
 			},
 			{
 				eventName: 'collapse.collapsable',
-				listener: () => this.boxElements.forEach((box) => (box.dataset.collapsableState = 'collapsing'))
+				listener: (event: CollapsableEvent) => {
+					if (event.target !== collapsableElement) {
+						return
+					}
+					this.boxElements.forEach((box) => (box.dataset.collapsableState = 'collapsing'))
+				}
 			},
 			{
 				eventName: 'expanded.collapsable',
-				listener: () => this.boxElements.forEach((box) => delete box.dataset.collapsableState)
+				listener: (event: CollapsableEvent) => {
+					if (event.target !== collapsableElement) {
+						return
+					}
+					this.boxElements.forEach((box) => delete box.dataset.collapsableState)
+				}
 			},
 			{
 				eventName: 'collapsed.collapsable',
-				listener: () => this.boxElements.forEach((box) => delete box.dataset.collapsableState)
+				listener: (event: CollapsableEvent) => {
+					if (event.target !== collapsableElement) {
+						return
+					}
+					this.boxElements.forEach((box) => delete box.dataset.collapsableState)
+				}
 			}
 		]
 
@@ -165,7 +186,7 @@ export class CollapsableItem {
 			this.addCollapsableEventListener({
 				element: this.element,
 				eventName: collapsableListener.eventName,
-				listener: collapsableListener.listener
+				listener: collapsableListener.listener as EventListener
 			})
 		})
 	}
@@ -179,6 +200,10 @@ export class CollapsableItem {
 	 * Handling common parts of expanding and collapsing
 	 */
 	private handleExpandCollapse(action: CollapsableItemAction, collapsableEvent: any, data: any): boolean {
+		if (this.media && !this.media.matches) {
+			return false
+		}
+
 		const { options } = this.collapsable
 		let eventName: CollapsableItemEvents = 'expanded.collapsable'
 		let addClass = options.classNames.expanded
@@ -393,6 +418,7 @@ export class CollapsableItem {
 		this.boxElements.forEach((box) => {
 			box.removeAttribute('aria-hidden')
 			box.removeAttribute('hidden')
+			delete box.dataset.collapsableState
 		})
 
 		this.element.dispatchEvent(new CustomEvent('destroy.collapsable', { bubbles: true }))