diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index ad5a59e56..5f90e7920 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -254,19 +254,6 @@ export class ConversationHeader extends React.Component<Props> {
     );
   }
 
-  public renderSearch() {
-    return (
-      <div className="search-icon">
-        <SessionIconButton
-          iconType={SessionIconType.Search}
-          iconSize={SessionIconSize.Large}
-          iconPadded={true}
-          onClick={this.highlightMessageSearch}
-        />
-      </div>
-    );
-  }
-
   public renderOptions(triggerId: string) {
     const { showBackButton } = this.props;
 
@@ -392,12 +379,7 @@ export class ConversationHeader extends React.Component<Props> {
           </div>
           {this.renderExpirationLength()}
 
-          {!this.props.isRss && (
-            <>
-              {this.renderSearch()}
-              {this.renderAvatar()}
-            </>
-          )}
+          {!this.props.isRss && this.renderAvatar()}
 
           {this.renderMenu(triggerId)}
         </div>
@@ -411,12 +393,6 @@ export class ConversationHeader extends React.Component<Props> {
     }
   }
 
-  public highlightMessageSearch() {
-    // This is a temporary fix. In future we want to search
-    // messages in the current conversation
-    $('.session-search-input input').focus();
-  }
-
   private renderPublicMenuItems() {
     const {
       i18n,