diff --git a/resources/assets/js/views/estimates/ItemSelect.vue b/resources/assets/js/views/estimates/ItemSelect.vue
index fba3d2fd..596553d0 100644
--- a/resources/assets/js/views/estimates/ItemSelect.vue
+++ b/resources/assets/js/views/estimates/ItemSelect.vue
@@ -12,6 +12,7 @@
       ref="baseSelect"
       v-model="itemSelect"
       :options="items"
+      :loading="loading"
       :show-labels="false"
       :preserve-search="true"
       :initial-search="item.name"
@@ -20,7 +21,7 @@
       label="name"
       class="multi-select-item"
       @value="onTextChange"
-      @select="(val) => $emit('select', val)"
+      @select="onSelect"
     >
       <div slot="afterList">
         <button type="button" class="list-add-button" @click="openItemModal">
@@ -142,6 +143,10 @@ export default {
         'data': {taxPerItem: this.taxPerItem, taxes: this.taxes}
       })
     },
+    onSelect(val) {
+      this.$emit('select', val)
+      this.fetchItems()
+    },    
     deselectItem () {
       this.itemSelect = null
       this.$emit('deselect')
diff --git a/resources/assets/js/views/invoices/ItemSelect.vue b/resources/assets/js/views/invoices/ItemSelect.vue
index aed1dd20..1f97677c 100644
--- a/resources/assets/js/views/invoices/ItemSelect.vue
+++ b/resources/assets/js/views/invoices/ItemSelect.vue
@@ -12,6 +12,7 @@
       ref="baseSelect"
       v-model="itemSelect"
       :options="items"
+      :loading="loading"
       :show-labels="false"
       :preserve-search="true"
       :initial-search="item.name"
diff --git a/resources/assets/sass/components/vue-multi-select.scss b/resources/assets/sass/components/vue-multi-select.scss
index f6b4c02c..9a9ab8c7 100644
--- a/resources/assets/sass/components/vue-multi-select.scss
+++ b/resources/assets/sass/components/vue-multi-select.scss
@@ -27,6 +27,7 @@ fieldset[disabled] .multiselect {
     top: 50%;
     left: 50%;
     margin: -8px 0 0 -8px;
+    z-index: 5;
     width: 16px;
     height: 16px;
     border-radius: 100%;