diff --git a/package.json b/package.json
index 508e6a22..10f9b41a 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
       {
         "path": "./dist/vue-select.js",
         "compression": "none",
-        "maxSize": "22 KB"
+        "maxSize": "23 KB"
       },
       {
         "path": "./dist/vue-select.css",
diff --git a/src/components/Select.vue b/src/components/Select.vue
index f836f3f8..a0360b79 100644
--- a/src/components/Select.vue
+++ b/src/components/Select.vue
@@ -3,19 +3,19 @@
 </style>
 
 <template>
-  <div :dir="dir" class="v-select" :class="stateClasses">
+  <div
+    :id="`v-select-${uid}`"
+    :dir="dir"
+    class="v-select"
+    :class="stateClasses"
+  >
     <slot name="header" v-bind="scope.header" />
-    <div
-      :id="`vs${uid}__combobox`"
-      ref="toggle"
-      class="vs__dropdown-toggle"
-      role="combobox"
-      :aria-expanded="dropdownOpen.toString()"
-      :aria-owns="`vs${uid}__listbox`"
-      :aria-label="ariaLabelCombobox"
-      @mousedown="toggleDropdown($event)"
-    >
-      <div ref="selectedOptions" class="vs__selected-options">
+    <div ref="toggle" class="vs__dropdown-toggle">
+      <div
+        ref="selectedOptions"
+        class="vs__selected-options"
+        @mousedown="toggleDropdown"
+      >
         <slot
           v-for="(option, index) in selectedValue"
           name="selected-option-container"
@@ -70,13 +70,25 @@
           <component :is="childComponents.Deselect" />
         </button>
 
-        <slot name="open-indicator" v-bind="scope.openIndicator">
-          <component
-            :is="childComponents.OpenIndicator"
-            v-if="!noDrop"
-            v-bind="scope.openIndicator.attributes"
-          />
-        </slot>
+        <!-- tabindex -1 is used to remove it from the tab sequence as tabbing to the input combobox opens the dropdown -->
+        <button
+          v-if="!noDrop"
+          ref="openIndicatorButton"
+          class="vs__open-indicator-button"
+          type="button"
+          tabindex="-1"
+          :aria-labelledby="`vs${uid}__listbox`"
+          :aria-controls="`vs${uid}__listbox`"
+          :aria-expanded="dropdownOpen.toString()"
+          @mousedown="toggleDropdown"
+        >
+          <slot name="open-indicator" v-bind="scope.openIndicator">
+            <component
+              :is="childComponents.OpenIndicator"
+              v-bind="scope.openIndicator.attributes"
+            />
+          </slot>
+        </button>
 
         <slot name="spinner" v-bind="scope.spinner">
           <div v-show="mutableLoading" class="vs__spinner">Loading...</div>
@@ -92,6 +104,7 @@
         v-append-to-body
         class="vs__dropdown-menu"
         role="listbox"
+        :aria-label="ariaLabelListbox"
         :aria-multiselectable="multiple"
         tabindex="-1"
         @mousedown.prevent="onMousedown"
@@ -131,6 +144,7 @@
         v-else
         :id="`vs${uid}__listbox`"
         role="listbox"
+        :aria-label="ariaLabelListbox"
         style="display: none; visibility: hidden"
       ></ul>
     </transition>
@@ -305,6 +319,16 @@ export default {
       default: 'Search for options',
     },
 
+    /**
+     * Allows to customize the `aria-label` set on the listbox element.
+     * @type {String}
+     * @default 'Options'
+     */
+    ariaLabelListbox: {
+      type: String,
+      default: 'Options',
+    },
+
     /**
      * Allows to customize the `aria-label` set on the clear-selected button
      * @type {String}
@@ -811,14 +835,17 @@ export default {
       return {
         search: {
           attributes: {
+            id: this.inputId,
             disabled: this.disabled,
             placeholder: this.searchPlaceholder,
             tabindex: this.tabindex,
             readonly: !this.searchable,
-            id: this.inputId,
+            role: 'combobox',
             'aria-autocomplete': 'list',
-            'aria-labelledby': `vs${this.uid}__combobox`,
+            'aria-label': this.ariaLabelCombobox,
             'aria-controls': `vs${this.uid}__listbox`,
+            'aria-owns': `vs${this.uid}__listbox`,
+            'aria-expanded': this.dropdownOpen.toString(),
             ref: 'search',
             type: 'search',
             autocomplete: this.autocomplete,
diff --git a/src/css/global/states.css b/src/css/global/states.css
index 3c2659f9..ccbf334b 100644
--- a/src/css/global/states.css
+++ b/src/css/global/states.css
@@ -20,6 +20,7 @@
     .vs__clear,
     .vs__search,
     .vs__selected,
+    .vs__open-indicator-button,
     .vs__open-indicator {
         cursor: var(--vs-disabled-cursor);
         background-color: var(--vs-disabled-bg);
diff --git a/src/css/modules/open-indicator-button.css b/src/css/modules/open-indicator-button.css
new file mode 100644
index 00000000..0b662d6e
--- /dev/null
+++ b/src/css/modules/open-indicator-button.css
@@ -0,0 +1,8 @@
+/* Open Indicator Button */
+
+.vs__open-indicator-button {
+    padding: 0;
+    border: 0;
+    background-color: transparent;
+    cursor: pointer;
+}
diff --git a/src/css/vue-select.css b/src/css/vue-select.css
index 11598249..8b09b372 100644
--- a/src/css/vue-select.css
+++ b/src/css/vue-select.css
@@ -4,6 +4,7 @@
 @import 'global/states.css';
 
 @import 'modules/dropdown-toggle.css';
+@import 'modules/open-indicator-button.css';
 @import 'modules/open-indicator.css';
 @import 'modules/clear.css';
 @import 'modules/dropdown-menu.css';
diff --git a/tests/unit/Accessibility.spec.js b/tests/unit/Accessibility.spec.js
index ba4fc13b..0dd1af28 100644
--- a/tests/unit/Accessibility.spec.js
+++ b/tests/unit/Accessibility.spec.js
@@ -32,17 +32,61 @@ describe('Search Slot Scope', () => {
       ).toEqual(`vs${Select.vm.uid}__option-2`)
     })
   })
+
+  describe('aria-expanded', () => {
+    it('expanded attribute should reflect dropdown open state', async () => {
+      const Select = mountDefault()
+      const input = Select.findComponent({ ref: 'search' })
+
+      expect(Select.vm.open).toEqual(false)
+      expect(input.attributes('aria-expanded')).toEqual('false')
+
+      Select.vm.open = true
+      await Select.vm.$nextTick()
+      expect(Select.vm.open).toEqual(true)
+      expect(input.attributes('aria-expanded')).toEqual('true')
+    })
+  })
 })
 
 describe('UID', () => {
   it('works with strings', () => {
     const Select = mountDefault({ uid: 'hello' })
-    expect(Select.find('#vshello__combobox').exists()).toBeTruthy()
+    expect(Select.find('#v-select-hello').exists()).toBeTruthy()
   })
 
   it('works with numbers', () => {
     const Select = mountDefault({ uid: 2 })
-    expect(Select.find('#vs2__combobox').exists()).toBeTruthy()
+    expect(Select.find('#v-select-2').exists()).toBeTruthy()
+  })
+})
+
+describe('Selected Options Wrapper', () => {
+  it('toggle with mouse', () => {
+    const Select = mountDefault()
+    Select.findComponent({ ref: 'selectedOptions' }).trigger('mousedown')
+    expect(Select.vm.open).toEqual(true)
+    Select.findComponent({ ref: 'selectedOptions' }).trigger('mousedown')
+    expect(Select.vm.open).toEqual(false)
+  })
+})
+
+describe('Open Indicator', () => {
+  it('hidden from keyboard navigation', () => {
+    const Select = mountDefault()
+    expect(
+      Select.findComponent({ ref: 'openIndicatorButton' }).attributes(
+        'tabindex'
+      )
+    ).toEqual('-1')
+  })
+
+  it('toggle with mouse', () => {
+    const Select = mountDefault()
+    Select.findComponent({ ref: 'openIndicatorButton' }).trigger('mousedown')
+    expect(Select.vm.open).toEqual(true)
+    Select.findComponent({ ref: 'openIndicatorButton' }).trigger('mousedown')
+    expect(Select.vm.open).toEqual(false)
   })
 })