diff --git a/ui/src/hosts/components/HostsTable.js b/ui/src/hosts/components/HostsTable.js
index bfbdfbf4e9..3cdc700685 100644
--- a/ui/src/hosts/components/HostsTable.js
+++ b/ui/src/hosts/components/HostsTable.js
@@ -12,8 +12,8 @@ const HostsTable = React.createClass({
     };
   },
 
-  filterHosts() {
-    const hosts = this.props.hosts.filter((h) => h.name.search(this.refs.filter.value) !== -1);
+  filterHosts(searchTerm) {
+    const hosts = this.props.hosts.filter((h) => h.name.search(searchTerm) !== -1);
     this.setState({filteredHosts: hosts});
   },
 
@@ -22,9 +22,7 @@ const HostsTable = React.createClass({
 
     return (
       <div>
-        <div className="col-md-3">
-          <input ref="filter" type="text" className="form-control" onChange={this.filterHosts}/>
-        </div>
+        <SearchBar onSearch={this.filterHosts} />
         <Table sortable={true} className="table v-center">
           <Thead>
             <Th column="name">Hostname</Th>
@@ -52,4 +50,31 @@ const HostsTable = React.createClass({
   },
 });
 
+const SearchBar = React.createClass({
+  propTypes: {
+    onSearch: PropTypes.func.isRequired,
+  },
+
+  handleChange() {
+    this.props.onSearch(this.refs.searchInput.value);
+  },
+
+  render() {
+    return (
+      <div className="users__search-widget input-group">
+        <div className="input-group-addon">
+          <span className="icon search" aria-hidden="true"></span>
+        </div>
+        <input
+          type="text"
+          className="form-control"
+          placeholder="Find host"
+          ref="searchInput"
+          onChange={this.handleChange}
+        />
+      </div>
+    );
+  },
+});
+
 export default HostsTable;