diff --git a/src/accordion/accordion-group.component.ts b/src/accordion/accordion-group.component.ts
index e5a9331e10..02d3a58556 100644
--- a/src/accordion/accordion-group.component.ts
+++ b/src/accordion/accordion-group.component.ts
@@ -17,10 +17,10 @@ import { AccordionComponent } from './accordion.component';
 <div class="panel card" [ngClass]="panelClass">
   <div class="panel-heading card-header" role="tab" (click)="toggleOpen($event)">
     <div class="panel-title card-title">
-      <a href role="button" class="accordion-toggle" [attr.aria-expanded]="isOpen">
+      <div role="button" class="accordion-toggle" [attr.aria-expanded]="isOpen">
         <div *ngIf="heading"[ngClass]="{'text-muted': isDisabled}">{{heading}}</div>
         <ng-content select="[accordion-heading]"></ng-content>
-      </a>
+      </div>
     </div>
   </div>
   <div class="panel-collapse collapse" role="tabpanel" [collapse]="!isOpen">
@@ -75,7 +75,6 @@ export class AccordionPanelComponent implements OnInit, OnDestroy {
   }
 
   public toggleOpen(event: Event): any {
-    event.preventDefault();
     if (!this.isDisabled) {
       this.isOpen = !this.isOpen;
     }
diff --git a/src/spec/accordion.component.spec.ts b/src/spec/accordion.component.spec.ts
index 62f84dc09a..cca3c95c84 100644
--- a/src/spec/accordion.component.spec.ts
+++ b/src/spec/accordion.component.spec.ts
@@ -101,12 +101,12 @@ describe('Component: Accordion', () => {
   });
 
   it('should have the appropriate heading', () => {
-    const titles = Array.from(element.querySelectorAll('.panel-heading a span'));
+    const titles = Array.from(element.querySelectorAll('.panel-heading .accordion-toggle span'));
     titles.forEach((title:HTMLElement, idx:number) => expect(hasTitle(title, `Panel ${idx + 1}`)).toBe(true));
   });
 
   it('should only open one at a time', () => {
-    const headingLinks = element.querySelectorAll('.panel-title a');
+    const headingLinks = element.querySelectorAll('.accordion-toggle');
 
     headingLinks[0].click();
     fixture.detectChanges();
@@ -132,7 +132,7 @@ describe('Component: Accordion', () => {
   it('should not open disabled panels from click', () => {
     context.panels[0].isDisabled = true;
     fixture.detectChanges();
-    const headingLinks = element.querySelectorAll('.panel-title a');
+    const headingLinks = element.querySelectorAll('.panel-title .accordion-toggle');
     headingLinks[0].click();
     fixture.detectChanges();
     expectOpenPanels(element, [false, false, false]);