diff --git a/src/components/common/Common.css b/src/components/common/Common.css
index c436ddbc7..4570bbaa5 100644
--- a/src/components/common/Common.css
+++ b/src/components/common/Common.css
@@ -84,6 +84,15 @@ button {
     border-radius: 0;
 }
 
+.p-link {
+	text-align: left;
+	background: transparent;
+	margin: 0;
+	padding: 0;
+	border: none;
+	cursor: pointer;
+}
+
 /* Overlay Animations */
 .p-input-overlay {
     -webkit-transform: translateY(5%);
diff --git a/src/components/dropdown/Dropdown.vue b/src/components/dropdown/Dropdown.vue
index cf326ba07..2533af666 100644
--- a/src/components/dropdown/Dropdown.vue
+++ b/src/components/dropdown/Dropdown.vue
@@ -17,7 +17,7 @@
         <transition name="p-input-overlay" @enter="onOverlayEnter" @leave="onOverlayLeave">
             <div ref="overlay" class="p-dropdown-panel" v-if="overlayVisible">
                 <div v-if="filter" class="p-dropdown-filter-container">
-                    <input type="text" v-model="filterValue" autoComplete="off" class="p-dropdown-filter p-inputtext p-component" :placeholder="filterPlaceholder"  @keydown="onFilterKeyDown" />
+                    <input type="text" v-model="filterValue" autoComplete="off" class="p-dropdown-filter p-inputtext p-component" :placeholder="filterPlaceholder" @keydown="onFilterKeyDown" />
                     <span class="p-dropdown-filter-icon pi pi-search"></span>
                 </div>
                 <div ref="itemsWrapper" class="p-dropdown-items-wrapper" :style="{'max-height': scrollHeight}">
@@ -350,7 +350,7 @@ export default {
     },
     computed: {
         visibleOptions() {
-            if (this.filterValue)
+            if (this.filterValue && this.filterValue.trim().length > 0)
                 return this.options.filter(option => this.getOptionLabel(option).toLowerCase().indexOf(this.filterValue.toLowerCase()) > -1);
             else
                 return this.options;
diff --git a/src/components/multiselect/MultiSelect.css b/src/components/multiselect/MultiSelect.css
index ec114cd4a..d609decf2 100644
--- a/src/components/multiselect/MultiSelect.css
+++ b/src/components/multiselect/MultiSelect.css
@@ -55,6 +55,7 @@
     padding: 0.2em;
     position: absolute;
     min-width: 10em;
+    z-index: 2;
 }
 
 .p-multiselect .p-multiselect-panel {
diff --git a/src/components/multiselect/MultiSelect.vue b/src/components/multiselect/MultiSelect.vue
index 06f0d50f9..893daeacd 100644
--- a/src/components/multiselect/MultiSelect.vue
+++ b/src/components/multiselect/MultiSelect.vue
@@ -15,6 +15,23 @@
         </div>
         <transition name="p-input-overlay" @enter="onOverlayEnter" @leave="onOverlayLeave">
             <div ref="overlay" class="p-multiselect-panel" v-if="overlayVisible">
+                <div class="p-multiselect-header">
+                    <div class="p-checkbox p-component" @click="onToggleAll">
+                        <div class="p-hidden-accessible">
+                            <input type="checkbox" readonly>
+                        </div>
+                        <div :class="['p-checkbox-box p-component', {'p-highlight': allSelected}]">
+                            <span :class="['p-checkbox-icon p-c', {'pi pi-check': allSelected}]"></span>
+                        </div>
+                    </div>
+                    <div class="p-multiselect-filter-container">
+                        <input type="text" v-model="filterValue" class="p-multiselect-filter p-component p-inputtext p-component" :placeholder="filterPlaceholder">
+                        <span class="p-multiselect-filter-icon pi pi-search"></span>
+                    </div>
+                    <button class="p-multiselect-close p-link" @click="onCloseClick">
+                        <span class="p-multiselect-close-icon pi pi-times" />
+                    </button>
+                </div>
                 <div ref="itemsWrapper" class="p-multiselect-items-wrapper" :style="{'max-height': scrollHeight}">
                     <ul class="p-multiselect-items p-multiselect-list p-component">
                         <li v-for="(option, i) of visibleOptions" :class="['p-multiselect-item', {'p-highlight': isSelected(option), 'p-disabled': isOptionDisabled(option)}]"
@@ -111,12 +128,15 @@ export default {
                 this.$refs.focusInput.focus();
             }
         },
+        onCloseClick() {
+            this.overlayVisible = false;
+        },
         onKeyDown(event) {
             switch(event.which) {
                 //down
                 case 40:
-                    if (this.visibleOptions && this.overlayVisible && event.altKey) {
-                        this.overlayVisible = false;
+                    if (this.visibleOptions && !this.overlayVisible && event.altKey) {
+                        this.overlayVisible = true;
                     } 
                 break;
 
@@ -254,11 +274,17 @@ export default {
             }
 
             return label;
+        },
+        onToggleAll(event) {
+            const value = this.allSelected ? [] : this.visibleOptions;
+
+            this.$emit('input', value);
+            this.$emit('change', {originalEvent: event, value: value});
         }
     },
     computed: {
         visibleOptions() {
-            if (this.filterValue)
+            if (this.filterValue && this.filterValue.trim().length > 0)
                 return this.options.filter(option => this.getOptionLabel(option).toLowerCase().indexOf(this.filterValue.toLowerCase()) > -1);
             else
                 return this.options;
@@ -299,6 +325,12 @@ export default {
             }
 
             return label;
+        },
+        allSelected() {
+            if (this.filterValue && this.filterValue.trim().length > 0)
+                return this.value && this.visibleOptions && (this.value.length > 0 && this.value.length === this.visibleOptions.length);
+            else
+                return this.value && this.options && (this.value.length > 0 && this.value.length === this.options.length);
         }
     }
 }
diff --git a/src/views/multiselect/MultiSelectDemo.vue b/src/views/multiselect/MultiSelectDemo.vue
index fbcfd937b..19c097ad8 100644
--- a/src/views/multiselect/MultiSelectDemo.vue
+++ b/src/views/multiselect/MultiSelectDemo.vue
@@ -57,7 +57,7 @@ export default {
 
 <style lang="scss" scoped>
 .p-multiselect {
-    min-width: 12em;
+    min-width: 15em;
 }
 
 .p-multiselect-car-option {