diff --git a/src/typeahead/typeahead.directive.ts b/src/typeahead/typeahead.directive.ts
index 362d5aefc8..8c3635a24b 100644
--- a/src/typeahead/typeahead.directive.ts
+++ b/src/typeahead/typeahead.directive.ts
@@ -220,7 +220,7 @@ export class TypeaheadDirective implements OnInit, OnDestroy {
       }
 
       // enter, tab
-      if (e.keyCode === 13 || e.keyCode === 9) {
+      if (e.keyCode === 13) {
         this._container.selectActiveMatch();
 
         return;
@@ -261,6 +261,7 @@ export class TypeaheadDirective implements OnInit, OnDestroy {
     // if an item is visible - don't change focus
     if (e.keyCode === 9) {
       e.preventDefault();
+      this._container.selectActiveMatch();
 
       return;
     }