diff --git a/projects/angular/src/modal/modal-stack.service.ts b/projects/angular/src/modal/modal-stack.service.ts
index f74443a116..a4d439587b 100644
--- a/projects/angular/src/modal/modal-stack.service.ts
+++ b/projects/angular/src/modal/modal-stack.service.ts
@@ -28,7 +28,7 @@ export class ModalStackService {
     }
 
     if (isPlatformBrowser(this.platformId)) {
-      document.body.addEventListener('keyup', this.keyUpEventListener);
+      document.body.addEventListener('keydown', this.keyUpEventListener);
     }
   }
 
@@ -40,7 +40,7 @@ export class ModalStackService {
     }
 
     if (this.modalStack.length === 0 && isPlatformBrowser(this.platformId)) {
-      document.body.removeEventListener('keyup', this.keyUpEventListener);
+      document.body.removeEventListener('keydown', this.keyUpEventListener);
     }
   }
 
diff --git a/projects/demo/src/app/wizard/wizard-basic.demo.html b/projects/demo/src/app/wizard/wizard-basic.demo.html
index 2612423ca8..7d1eca8d9b 100644
--- a/projects/demo/src/app/wizard/wizard-basic.demo.html
+++ b/projects/demo/src/app/wizard/wizard-basic.demo.html
@@ -24,6 +24,11 @@
   <clr-wizard-button [type]="'finish'">Finish</clr-wizard-button>
 
   <clr-wizard-page>
+    <select>
+      <option>1</option>
+      <option>2</option>
+      <option>3</option>
+    </select>
     <ng-template clrPageTitle>Title for page 1</ng-template>
     <!-- mandatory -->
     <ng-template clrPageNavTitle>Step 1</ng-template>