diff --git a/lib/core/info-drawer/info-drawer.component.html b/lib/core/info-drawer/info-drawer.component.html
index d42bf89de9..8006c2fdd4 100644
--- a/lib/core/info-drawer/info-drawer.component.html
+++ b/lib/core/info-drawer/info-drawer.component.html
@@ -7,7 +7,7 @@
     <ng-container info-drawer-content *ngIf="showTabLayout(); then tabLayout else singleLayout"></ng-container>
 
     <ng-template #tabLayout>
-        <mat-tab-group class="adf-info-drawer-tabs" (selectChange)="onTabChange($event)">
+        <mat-tab-group class="adf-info-drawer-tabs" (selectedTabChange)="onTabChange($event)">
             <ng-container *ngFor="let contentBlock of contentBlocks">
                 <mat-tab [label]="contentBlock.label" class="adf-info-drawer-tab">
                     <ng-container *ngTemplateOutlet="contentBlock.content"></ng-container>
diff --git a/lib/core/info-drawer/info-drawer.component.spec.ts b/lib/core/info-drawer/info-drawer.component.spec.ts
index 4d28b94a10..8c3c594b93 100644
--- a/lib/core/info-drawer/info-drawer.component.spec.ts
+++ b/lib/core/info-drawer/info-drawer.component.spec.ts
@@ -17,6 +17,7 @@
 
 import { Component } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatTabChangeEvent } from '@angular/material';
 import { By } from '@angular/platform-browser';
 import { MaterialModule } from '../material.module';
 import { InfoDrawerLayoutComponent } from './info-drawer-layout.component';
@@ -57,9 +58,8 @@ describe('InfoDrawerComponent', () => {
     it('should emit when tab is changed', () => {
         let tabEmitSpy = spyOn(component.currentTab, 'emit');
         let event = {index: 1, tab: {textLabel: 'DETAILS'}};
-        component.onTabChange(event);
-        expect(tabEmitSpy).toHaveBeenCalled();
-        expect(tabEmitSpy).toHaveBeenCalledWith('DETAILS');
+        component.onTabChange(<MatTabChangeEvent> event);
+        expect(tabEmitSpy).toHaveBeenCalledWith(1);
     });
 
     it('should render the title', () => {
diff --git a/lib/core/info-drawer/info-drawer.component.ts b/lib/core/info-drawer/info-drawer.component.ts
index 458ae32584..4af5a8ab79 100644
--- a/lib/core/info-drawer/info-drawer.component.ts
+++ b/lib/core/info-drawer/info-drawer.component.ts
@@ -16,6 +16,7 @@
  */
 
 import { Component, ContentChildren, EventEmitter, Input, Output, QueryList, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core';
+import { MatTabChangeEvent } from '@angular/material';
 @Component({
     selector: 'adf-info-drawer-tab',
     template: '<ng-template><ng-content></ng-content></ng-template>'
@@ -37,7 +38,7 @@ export class InfoDrawerComponent {
     title: string|null = null;
 
     @Output()
-    currentTab: EventEmitter<any> = new EventEmitter<any>();
+    currentTab: EventEmitter<number> = new EventEmitter<number>();
 
     @ContentChildren(InfoDrawerTabComponent)
     contentBlocks: QueryList<InfoDrawerTabComponent>;
@@ -46,8 +47,7 @@ export class InfoDrawerComponent {
         return this.contentBlocks.length > 0;
     }
 
-    onTabChange(event: any) {
-        const tab = event.tab;
-        this.currentTab.emit(tab.textLabel);
+    onTabChange(event: MatTabChangeEvent) {
+        this.currentTab.emit(event.index);
     }
 }