diff --git a/ui/src/hosts/components/HostsTable.js b/ui/src/hosts/components/HostsTable.js
index 7eae8ee58..0d2427522 100644
--- a/ui/src/hosts/components/HostsTable.js
+++ b/ui/src/hosts/components/HostsTable.js
@@ -29,7 +29,18 @@ const HostsTable = React.createClass({
   },
 
   filterHosts(allHosts, searchTerm) {
-    const hosts = allHosts.filter((h) => h.name.search(searchTerm) !== -1);
+    const hosts = allHosts.filter((h) => {
+      let apps = null;
+      if (h.apps) {
+        apps = h.apps.join(', ');
+      } else {
+        apps = '';
+      }
+      return (
+        h.name.search(searchTerm) !== -1 ||
+        apps.search(searchTerm) !== -1
+      );
+    });
     this.setState({searchTerm, filteredHosts: hosts});
   },