diff --git a/webapp/components/suggestion/command_provider.jsx b/webapp/components/suggestion/command_provider.jsx
index 73ae4deaa5..58b77a331e 100644
--- a/webapp/components/suggestion/command_provider.jsx
+++ b/webapp/components/suggestion/command_provider.jsx
@@ -9,7 +9,7 @@ import Suggestion from './suggestion.jsx';
 
 class CommandSuggestion extends Suggestion {
     render() {
-        const {item, isSelection, onClick} = this.props;
+        const {item, isSelection} = this.props;
 
         let className = 'command';
         if (isSelection) {
@@ -19,7 +19,7 @@ class CommandSuggestion extends Suggestion {
         return (
             <div
                 className={className}
-                onClick={onClick}
+                onClick={this.handleClick}
             >
                 <div className='command__title'>
                     <string>{item.suggestion} {item.hint}</string>
diff --git a/webapp/components/suggestion/emoticon_provider.jsx b/webapp/components/suggestion/emoticon_provider.jsx
index a110796e1e..e2ed7978de 100644
--- a/webapp/components/suggestion/emoticon_provider.jsx
+++ b/webapp/components/suggestion/emoticon_provider.jsx
@@ -23,7 +23,7 @@ class EmoticonSuggestion extends Suggestion {
         return (
             <div
                 className={className}
-                onClick={this.props.onClick}
+                onClick={this.handleClick}
             >
                 <div className='pull-left'>
                     <img
diff --git a/webapp/components/suggestion/search_channel_provider.jsx b/webapp/components/suggestion/search_channel_provider.jsx
index 2b80052040..2e60d579f3 100644
--- a/webapp/components/suggestion/search_channel_provider.jsx
+++ b/webapp/components/suggestion/search_channel_provider.jsx
@@ -11,7 +11,7 @@ import Suggestion from './suggestion.jsx';
 
 class SearchChannelSuggestion extends Suggestion {
     render() {
-        const {item, isSelection, onClick} = this.props;
+        const {item, isSelection} = this.props;
 
         let className = 'search-autocomplete__item';
         if (isSelection) {
@@ -20,7 +20,7 @@ class SearchChannelSuggestion extends Suggestion {
 
         return (
             <div
-                onClick={onClick}
+                onClick={this.handleClick}
                 className={className}
             >
                 <i className='fa fa fa-plus-square'></i>{item.name}
diff --git a/webapp/components/suggestion/search_user_provider.jsx b/webapp/components/suggestion/search_user_provider.jsx
index 5a9e70d0f7..1a3075a30c 100644
--- a/webapp/components/suggestion/search_user_provider.jsx
+++ b/webapp/components/suggestion/search_user_provider.jsx
@@ -11,7 +11,7 @@ import Suggestion from './suggestion.jsx';
 
 class SearchUserSuggestion extends Suggestion {
     render() {
-        const {item, isSelection, onClick} = this.props;
+        const {item, isSelection} = this.props;
 
         let className = 'search-autocomplete__item';
         if (isSelection) {
@@ -21,7 +21,7 @@ class SearchUserSuggestion extends Suggestion {
         return (
             <div
                 className={className}
-                onClick={onClick}
+                onClick={this.handleClick}
             >
                 <img
                     className='profile-img rounded'