2 files changed, 6 insertions, 14 deletions

diff --git a/web/react/components/search_autocomplete.jsx b/web/react/components/search_autocomplete.jsx
index f7d772677..03e14ec49 100644
--- a/web/react/components/search_autocomplete.jsx
+++ b/web/react/components/search_autocomplete.jsx
@@ -142,7 +142,10 @@ export default class SearchAutocomplete extends React.Component {
             let channels = ChannelStore.getAll();
 
             if (filter) {
-                channels = channels.filter((channel) => channel.name.startsWith(filter));
+                channels = channels.filter((channel) => channel.name.startsWith(filter) && channel.type !== 'D');
+            } else {
+                // don't show direct channels
+                channels = channels.filter((channel) => channel.type !== 'D');
             }
 
             channels.sort((a, b) => a.name.localeCompare(b.name));
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index 1b81a5ee0..90865475b 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -90,14 +90,10 @@ export default class SearchBar extends React.Component {
 
         this.refs.autocomplete.handleInputChange(e.target, term);
     }
-    handleMouseInput(e) {
-        e.preventDefault();
-    }
     handleUserBlur() {
         this.setState({focused: false});
     }
-    handleUserFocus(e) {
-        e.target.select();
+    handleUserFocus() {
         $('.search-bar__container').addClass('focused');
 
         this.setState({focused: true});
@@ -106,14 +102,8 @@ export default class SearchBar extends React.Component {
         if (terms.length) {
             this.setState({isSearching: true});
 
-            // append * if not present
-            let searchTerms = terms;
-            if (searchTerms.search(/\*\s*$/) === -1) {
-                searchTerms = searchTerms + '*';
-            }
-
             client.search(
-                searchTerms,
+                terms,
                 (data) => {
                     this.setState({isSearching: false});
                     if (utils.isMobile()) {
@@ -198,7 +188,6 @@ export default class SearchBar extends React.Component {
                         onBlur={this.handleUserBlur}
                         onChange={this.handleUserInput}
                         onKeyDown={this.handleKeyDown}
-                        onMouseUp={this.handleMouseInput}
                     />
                     {isSearching}
                     <SearchAutocomplete