diff --git a/src/components/select/option-group.vue b/src/components/select/option-group.vue
index b47f07e..ee5a3a2 100644
--- a/src/components/select/option-group.vue
+++ b/src/components/select/option-group.vue
@@ -1,8 +1,8 @@
 <template>
-    <li :class="[prefixCls + '-wrap']">
+    <li :class="[prefixCls + '-wrap']" v-show="!hidden">
         <div :class="[prefixCls + '-title']">{{ label }}</div>
         <ul>
-            <li :class="[prefixCls]"><slot></slot></li>
+            <li :class="[prefixCls]" v-el:options><slot></slot></li>
         </ul>
     </li>
 </template>
@@ -18,8 +18,30 @@
         },
         data () {
             return {
-                prefixCls: prefixCls
+                prefixCls: prefixCls,
+                hidden: false    // for search
             };
+        },
+        methods: {
+            queryChange () {
+                this.$nextTick(() => {
+                    const options = this.$els.options.querySelectorAll('.ivu-select-item');
+                    let hasVisibleOption = false;
+                    for (let i = 0; i < options.length; i++) {
+                        if (options[i].style.display !== 'none') {
+                            hasVisibleOption = true;
+                            break;
+                        }
+                    }
+                    this.hidden = !hasVisibleOption;
+                });
+            }
+        },
+        events: {
+            'on-query-change' () {
+                this.queryChange();
+                return true;
+            }
         }
     };
 </script>
diff --git a/test/routers/select.vue b/test/routers/select.vue
index fb250cd..baa8108 100644
--- a/test/routers/select.vue
+++ b/test/routers/select.vue
@@ -1,16 +1,9 @@
 <template>
-    <Row style="width: 400px">
-        <i-col span="12" style="padding-right:10px">
-            <i-select :model.sync="model11" filterable>
-                <i-option v-for="item in cityList" :value="item.value">{{ item.label }}</i-option>
-            </i-select>
-        </i-col>
-        <i-col span="12">
-            <i-select :model.sync="model12" filterable multiple>
-                <i-option v-for="item in cityList" :value="item.value">{{ item.label }}</i-option>
-            </i-select>
-        </i-col>
-    </Row>
+    <i-select :model.sync="model7" style="width:200px"
+              filterable>
+        <i-option v-for="item in cityList | limitBy 3" :value="item.value">{{ item.label }}</i-option>
+        <i-option v-for="item in cityList | limitBy 3 3" :value="item.value">{{ item.label }}</i-option>
+    </i-select>
 </template>
 <script>
     export default {
@@ -42,8 +35,7 @@
                         label: '重庆市'
                     }
                 ],
-                model11: '',
-                model12: []
+                model7: ''
             }
         }
     }
--
libgit2 0.21.4