diff --git a/src/components/MainToolbar.vue b/src/components/MainToolbar.vue
index f87d41b..86a7350 100644
--- a/src/components/MainToolbar.vue
+++ b/src/components/MainToolbar.vue
@@ -19,6 +19,20 @@
       </span>
     </v-toolbar-title>
     <v-spacer />
+    <v-text-field
+      :flat="!focusedSearch"
+      :solo="focusedSearch"
+      :solo-inverted="!focusedSearch"
+      hide-details
+      clearable
+      prepend-inner-icon="mdi-magnify"
+      :label="$t('search')"
+      @focus="focusedSearch = true"
+      @blur="focusedSearch = false"
+      @input="onSearch"
+      :value="searchQuery"
+    />
+    <v-spacer />
     <v-select
       class="locales"
       :items="locales"
@@ -32,85 +46,110 @@
 </template>
 
 <script lang="ts">
+import { throttle } from 'lodash';
 import Vue from 'vue';
 import { mapMutations } from 'vuex';
 
 import i18n, { tr, translations, defaultLocale } from '@/locale';
-import { DialogType } from '@/store/types';
+import { DialogType, DialogConfig, SnackBarConfig } from '@/store/types';
+import Component from 'vue-class-component';
+import { Prop, Emit, Watch } from 'vue-property-decorator';
 
-export default Vue.extend({
-  props: {
-    value: Boolean,
+@Component({
+  methods: {
+    ...mapMutations([
+      'showDialog',
+      'showSnackBar',
+    ]),
   },
-  data() {
-    let locales: {}[] = Object.entries(translations).map(([lang, translation]) => {
+})
+export default class MainToolbar extends Vue {
+  @Prop(Boolean)
+  readonly value!: boolean
+
+  showDialog!: (_: DialogConfig) => void
+  showSnackBar!: (_: SnackBarConfig) => void
+
+  locales = this.buildLocales()
+  currentLocale = i18n.locale()
+  oldLocale = this.currentLocale
+  focusedSearch = false
+
+  get searchQuery() {
+    return this.$store.getters.config.filter.query;
+  }
+
+  buildLocales() {
+    const locales: {}[] = Object.entries(translations).map(([lang, translation]) => {
       return {
         text: translation.lang,
         value: lang,
       };
     });
 
-    locales = [
+    return [
       {
         text: tr('auto'),
         value: null,
       },
       ...locales
     ]
+  }
 
-    const locale = i18n.locale();
+  @Emit('input')
+  toggle() {
+    return !this.value;
+  }
 
-    return {
-      locales,
-      oldLocale: locale,
-      currentLocale: locale,
-    };
-  },
-  methods: {
-    ...mapMutations([
-      'showDialog',
-      'showSnackBar',
-    ]),
-    toggle() {
-      this.$emit('input', !this.value);
-    },
-    async switchLocale(locale: keyof typeof translations | null) {
-      if (locale === this.oldLocale) {
-        return;
-      }
+  onSearch = throttle(async (v: string) => {
+    // avoid hang input
+    await this.$nextTick();
+    this.$store.commit('updateConfig', {
+      key: 'filter',
+      value: {
+        query: v,
+      },
+    });
+  }, 400)
 
-      const confirm = await new Promise((resolve) => {
-        const localeKey = !locale ? defaultLocale : locale
-        this.showDialog({
-          content: {
-            text: tr('dialog.switch_locale.msg', { lang: translations[localeKey].lang }),
-            type: DialogType.OkCancel,
-            callback: resolve,
-          },
-        });
+  async switchLocale(locale: keyof typeof translations | null) {
+    if (locale === this.oldLocale) {
+      return;
+    }
+
+    const confirm = await new Promise((resolve) => {
+      const localeKey = !locale ? defaultLocale : locale
+      this.showDialog({
+        content: {
+          text: tr('dialog.switch_locale.msg', { lang: translations[localeKey].lang }),
+          type: DialogType.OkCancel,
+          callback: resolve,
+        },
       });
+    });
 
-      if (!confirm) {
-        this.currentLocale = this.oldLocale;
-        return;
-      }
+    if (!confirm) {
+      this.currentLocale = this.oldLocale;
+      return;
+    }
 
-      this.$store.commit('updateConfig', {
-        key: 'locale',
-        value: locale,
-      });
+    this.$store.commit('updateConfig', {
+      key: 'locale',
+      value: locale,
+    });
 
-      this.showSnackBar(tr('label.reloading'))
+    this.showSnackBar({
+      text: tr('label.reloading'),
+    })
 
-      location.reload();
-    },
-  },
-  watch: {
-    currentLocale(v) {
-      this.switchLocale(v);
-    },
-  },
-});
+    location.reload();
+  }
+
+  @Watch('currentLocale')
+  onCurrentLocaleChanged(v: keyof typeof translations) {
+    this.switchLocale(v)
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/Torrents.vue b/src/components/Torrents.vue
index b8adc0d..6c3fdf8 100644
--- a/src/components/Torrents.vue
+++ b/src/components/Torrents.vue
@@ -407,6 +407,7 @@ export default class Torrents extends Vue {
     if (!this.isDataReady) {
       return [];
     }
+
     let list = this.allTorrents;
     if (this.filter.site !== null) {
       list = intersection(list, this.torrentGroupBySite[this.filter.site]);
@@ -417,6 +418,15 @@ export default class Torrents extends Vue {
     if (this.filter.state !== null) {
       list = intersection(list, this.torrentGroupByState[this.filter.state]);
     }
+    if (this.filter.query) {
+      const q = this.filter.query.toLowerCase();
+
+      list = list.filter(t => {
+        return t.name.toLowerCase().includes(q) ||
+          t.tracker.toLowerCase().includes(q) ||
+          t.category.toLowerCase().includes(q);
+      });
+    }
 
     return list;
   }
diff --git a/src/locale/en.ts b/src/locale/en.ts
index 17f4dc0..ebdded2 100644
--- a/src/locale/en.ts
+++ b/src/locale/en.ts
@@ -18,6 +18,7 @@ export default {
   info: 'Info',
   reset: 'Reset',
   login: 'Login',
+  search: 'Search',
 
   reannounce: 'Reannounce',
   recheck: 'Recheck',
diff --git a/src/locale/zh-CN.ts b/src/locale/zh-CN.ts
index 1393367..589ab62 100644
--- a/src/locale/zh-CN.ts
+++ b/src/locale/zh-CN.ts
@@ -18,6 +18,7 @@ export default {
   info: '信息',
   reset: '重置',
   login: '登录',
+  search: '搜索',
 
   reannounce: '重新通告',
   recheck: '重新检查',
diff --git a/src/store/config.ts b/src/store/config.ts
index 27f9804..b11e529 100644
--- a/src/store/config.ts
+++ b/src/store/config.ts
@@ -14,6 +14,7 @@ const defaultConfig = {
     state: null,
     category: null,
     site: null,
+    query: null,
   },
   locale: null,
 };
diff --git a/src/store/types.ts b/src/store/types.ts
index 66ffed8..0f450e3 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -11,6 +11,7 @@ export interface TorrentFilter {
   state: string;
   category: string;
   site: string;
+  query: string;
 }
 
 export interface ConfigState {