diff --git a/rigo/rigo/models/application.py b/rigo/rigo/models/application.py
index 46d8ce97d..1097079d1 100644
--- a/rigo/rigo/models/application.py
+++ b/rigo/rigo/models/application.py
@@ -877,6 +877,16 @@ class Application(object):
             escape_markup(description))
         return text
 
+    def search(self, keyword):
+        """
+        Match keyword against Application name. Return True if
+        the same contains keyword.
+        """
+        name = self.name
+        if keyword in name:
+            return True
+        return keyword.lower() in name.lower()
+
     def get_extended_markup(self):
         """
         Get Application markup text (extended version).
diff --git a/rigo/rigo/ui/gtk3/widgets/apptreeview.py b/rigo/rigo/ui/gtk3/widgets/apptreeview.py
index c5bdacda1..b5dba0ac8 100644
--- a/rigo/rigo/ui/gtk3/widgets/apptreeview.py
+++ b/rigo/rigo/ui/gtk3/widgets/apptreeview.py
@@ -31,7 +31,7 @@ from cellrenderers import CellRendererAppView, CellButtonRenderer, \
 
 from rigo.em import em, StockEms
 from rigo.enums import Icons
-from rigo.models.application import CategoryRowReference
+from rigo.models.application import CategoryRowReference, Application
 
 COL_ROW_DATA = 0
 
@@ -45,10 +45,12 @@ class AppTreeView(Gtk.TreeView):
 
     ACTION_BTNS = (VARIANT_REMOVE, VARIANT_INSTALL)
 
-    def __init__(self, apc, icons, show_ratings, icon_size, store=None):
+    def __init__(self, entropy_client, apc, icons, show_ratings,
+                 icon_size, store=None):
         Gtk.TreeView.__init__(self)
         self._logger = logging.getLogger(__name__)
 
+        self._entropy = entropy_client
         self._apc = apc
 
         self.pressed = False
@@ -116,9 +118,21 @@ class AppTreeView(Gtk.TreeView):
         # our own "activate" handler
         self.connect("row-activated", self._on_row_activated, tr)
 
+        self.set_search_column(0)
+        self.set_search_equal_func(self._app_search, None)
+        self.set_property("enable-search", True)
+
         self._transactions_connected = False
         self.connect('realize', self._on_realize, tr)
 
+
+    def _app_search(self, model, column, key, iterator, data):
+        pkg_match = model.get_value(iterator, 0)
+        if pkg_match is None:
+            return False
+        app = Application(self._entropy, None, pkg_match)
+        return not app.search(key)
+
     @property
     def appmodel(self):
         model = self.get_model()
diff --git a/rigo/rigo_app.py b/rigo/rigo_app.py
index 896cf10b0..0a7666bf3 100644
--- a/rigo/rigo_app.py
+++ b/rigo/rigo_app.py
@@ -1324,7 +1324,7 @@ class Rigo(Gtk.Application):
         self._app_view_c = ApplicationViewController(
             self._entropy, self._entropy_ws, self._builder)
 
-        self._view = AppTreeView(self._app_view_c, icons, True,
+        self._view = AppTreeView(self._entropy, self._app_view_c, icons, True,
                                  AppListStore.ICON_SIZE, store=None)
         self._scrolled_view.add(self._view)