diff --git a/src/components/Select.vue b/src/components/Select.vue
index 2d8c5f3..4fdd2c5 100644
--- a/src/components/Select.vue
+++ b/src/components/Select.vue
@@ -852,16 +852,10 @@
           case 9:
             //  tab
             return this.onTab();
-        }
-      },
-
-      /**
-       * Search 'input' KeyBoardEvent handler.
-       * @param e {KeyboardEvent}
-       * @return {Function}
-       */
-      onSearchKeyUp (e) {
-        switch (e.keyCode) {
+          case 13:
+            //  enter.prevent
+            e.preventDefault();
+            return this.typeAheadSelect();
           case 27:
             //  esc
             return this.onEscape();
@@ -873,10 +867,6 @@
             //  down.prevent
             e.preventDefault();
             return this.typeAheadDown();
-          case 13:
-            //  enter.prevent
-            e.preventDefault();
-            return this.typeAheadSelect();
         }
       }
     },
@@ -955,7 +945,6 @@
             },
             events: {
               'keydown': this.onSearchKeyDown,
-              'keyup': this.onSearchKeyUp,
               'blur': this.onSearchBlur,
               'focus': this.onSearchFocus,
               'input': (e) => this.search = e.target.value
diff --git a/tests/helpers.js b/tests/helpers.js
index fd45c88..77c5988 100755
--- a/tests/helpers.js
+++ b/tests/helpers.js
@@ -13,7 +13,7 @@ export const searchSubmit = (Wrapper, searchText = false) => {
   if (searchText) {
     Wrapper.vm.search = searchText;
   }
-  Wrapper.find({ ref: "search" }).trigger("keyup.enter")
+  Wrapper.find({ ref: "search" }).trigger("keydown.enter")
 };
 
 /**
diff --git a/tests/unit/Dropdown.spec.js b/tests/unit/Dropdown.spec.js
index 58b01e2..6ae22a4 100755
--- a/tests/unit/Dropdown.spec.js
+++ b/tests/unit/Dropdown.spec.js
@@ -109,14 +109,14 @@ describe("Toggling Dropdown", () => {
     expect(spy).toHaveBeenCalled();
   });
 
-  it("should remove existing search text on escape keyup", () => {
+  it("should remove existing search text on escape keydown", () => {
     const Select = selectWithProps({
       value: [{ label: "one" }],
       options: [{ label: "one" }]
     });
 
     Select.vm.search = "foo";
-    Select.find('.vs__search').trigger('keyup.esc')
+    Select.find('.vs__search').trigger('keydown.esc')
     expect(Select.vm.search).toEqual("");
   });
 
diff --git a/tests/unit/TypeAhead.spec.js b/tests/unit/TypeAhead.spec.js
index 6dcc6ab..a1a4755 100755
--- a/tests/unit/TypeAhead.spec.js
+++ b/tests/unit/TypeAhead.spec.js
@@ -23,7 +23,7 @@ describe("Moving the Typeahead Pointer", () => {
 
     Select.vm.typeAheadPointer = 1;
 
-    Select.find({ ref: "search" }).trigger("keyup.up");
+    Select.find({ ref: "search" }).trigger("keydown.up");
 
     expect(Select.vm.typeAheadPointer).toEqual(0);
   });
@@ -33,7 +33,7 @@ describe("Moving the Typeahead Pointer", () => {
 
     Select.vm.typeAheadPointer = 1;
 
-    Select.find({ ref: "search" }).trigger("keyup.down");
+    Select.find({ ref: "search" }).trigger("keydown.down");
 
     expect(Select.vm.typeAheadPointer).toEqual(2);
   });
@@ -53,7 +53,7 @@ describe("Moving the Typeahead Pointer", () => {
 
       Select.vm.typeAheadPointer = 1;
 
-      Select.find({ ref: "search" }).trigger("keyup.up");
+      Select.find({ ref: "search" }).trigger("keydown.up");
       expect(spy).toHaveBeenCalled();
     });
 
@@ -63,7 +63,7 @@ describe("Moving the Typeahead Pointer", () => {
 
       Select.vm.typeAheadPointer = 1;
 
-      Select.find({ ref: "search" }).trigger("keyup.down");
+      Select.find({ ref: "search" }).trigger("keydown.down");
       expect(spy).toHaveBeenCalled();
     });