1 files changed, 6 insertions, 0 deletions

diff --git a/webapp/components/search_bar.jsx b/webapp/components/search_bar.jsx
index 23f7d1762..1ed8445f8 100644
--- a/webapp/components/search_bar.jsx
+++ b/webapp/components/search_bar.jsx
@@ -248,6 +248,8 @@ export default class SearchBar extends React.Component {
         let mentionBtn;
         let flagBtn;
         if (this.props.showMentionFlagBtns) {
+            var mentionBtnClass = SearchStore.isMentionSearch ? 'active' : '';
+
             mentionBtn = (
                 <div
                     className='dropdown channel-header__links'
@@ -262,6 +264,7 @@ export default class SearchBar extends React.Component {
                             href='#'
                             type='button'
                             onClick={this.searchMentions}
+                            className={mentionBtnClass}
                         >
                             {'@'}
                         </a>
@@ -269,6 +272,8 @@ export default class SearchBar extends React.Component {
                 </div>
             );
 
+            var flagBtnClass = SearchStore.isFlaggedPosts ? 'active' : '';
+
             flagBtn = (
                 <div
                     className='dropdown channel-header__links'
@@ -283,6 +288,7 @@ export default class SearchBar extends React.Component {
                             href='#'
                             type='button'
                             onClick={this.getFlagged}
+                            className={flagBtnClass}
                         >
                             <span
                                 className='icon icon__flag'