diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.html b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.html
index 9d5cd3d6e6..4428abe76b 100644
--- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.html
+++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.html
@@ -1,10 +1,10 @@
 <div class="adf-panel adf-panel-default" [ngClass]="{'adf-panel-open': isOpen}">
-    <div class="adf-panel-heading" [ngClass]="{'adf-panel-heading-selected': isSelected}" (click)="onHeadingClick()">
+    <div class="adf-panel-heading" [ngClass]="{'adf-panel-heading-selected': isSelected}" (click)="toggleOpen($event)">
         <div id="heading-icon" *ngIf="hasHeadingIcon()" class="adf-panel-heading-icon">
             <i class="material-icons">{{headingIcon}}</i>
         </div>
-        <div id="heading-text" class="adf-panel-heading-text">{{heading}}</div>        
-        <div id="accordion-button" *ngIf="hasAccordionIcon" class="adf-panel-heading-toggle" (click)="toggleOpen($event)">
+        <div id="heading-text" class="adf-panel-heading-text">{{heading}}</div>
+        <div id="accordion-button" *ngIf="hasAccordionIcon" class="adf-panel-heading-toggle">
             <i class="material-icons">{{getAccordionIcon()}}</i>
         </div>
     </div>
diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.spec.ts
index 96453589f5..e703fd5d9f 100644
--- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.spec.ts
@@ -107,8 +107,8 @@ describe('AccordionGroupComponent', () => {
             expect(headName).toEqual(heading);
             done();
         });
-
-        component.onHeadingClick();
+        let header = element.querySelector('.adf-panel-heading');
+        header.click();
     });
 
 });
diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
index bfe7cd99b4..0819e055d7 100644
--- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
@@ -79,13 +79,11 @@ export class AccordionGroupComponent implements OnDestroy {
     toggleOpen(event: MouseEvent): void {
         event.preventDefault();
         this.isOpen = !this.isOpen;
+        this.headingClick.emit(this.heading);
     }
 
     getAccordionIcon(): string {
         return this.isOpen ? 'expand_less' : 'expand_more';
     }
 
-    onHeadingClick() {
-        this.headingClick.emit(this.heading);
-    }
 }