diff --git a/src/components/select/option.vue b/src/components/select/option.vue
index 749bb0cd..a8b60886 100644
--- a/src/components/select/option.vue
+++ b/src/components/select/option.vue
@@ -1,5 +1,10 @@
 <template>
-    <li :class="classes" @click.stop="select"><slot>{{ showLabel }}</slot></li>
+    <li
+        :class="classes"
+        @click.stop="select"
+        @mousedown.prevent
+        @touchstart.prevent
+    ><slot>{{ showLabel }}</slot></li>
 </template>
 <script>
     import Emitter from '../../mixins/emitter';
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index ba98364f..1584f800 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -337,6 +337,7 @@
             },
             getOptionData(value){
                 const option = this.flatOptions.find(({componentOptions}) => componentOptions.propsData.value === value);
+                if (!option) return {};
                 const textContent = option.componentOptions.children.reduce((str, child) => str + (child.text || ''), '');
                 const label = option.componentOptions.propsData.label || textContent || '';
                 return {
@@ -389,6 +390,7 @@
                 this.visible = typeof force !== 'undefined' ? force : !this.visible;
                 if (this.visible){
                     this.dropDownWidth = this.$el.getBoundingClientRect().width;
+                    this.broadcast('Drop', 'on-update-popper');
                 }
             },
             hideMenu () {
@@ -598,6 +600,9 @@
                 if (topOverflowDistance < 0) {
                     this.$refs.dropdown.$el.scrollTop += topOverflowDistance;
                 }
+            },
+            dropVisible(open){
+                this.broadcast('Drop', open ? 'on-update-popper' : 'on-destroy-popper');
             }
         }
     };