diff --git a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
index 9fb9776a3..1503bf46f 100644
--- a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
+++ b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
@@ -1,31 +1,14 @@
-import { Space, Button, Col } from "antd";
+import { Space } from "antd";
 import React from "react";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatArchiveButton from "../chat-archive-button/chat-archive-button.component";
 import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component";
 import ChatLabelComponent from "../chat-label/chat-label.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
-import { connect } from "react-redux";
-import { setSelectedConversation } from "../../redux/messaging/messaging.actions";
-import { LeftOutlined } from "@ant-design/icons";
 
-const mapDispatchToProps = (dispatch) => ({
-  setSelectedConversation: (conversationId) =>
-    dispatch(setSelectedConversation(conversationId)),
-});
-
-function ChatConversationTitle({ conversation, setSelectedConversation }) {
+export default function ChatConversationTitle({ conversation }) {
   return (
     <Space wrap>
-      <Col sm={0}>
-        <Button
-          onClick={() => setSelectedConversation()}
-          size="small"
-          type="text"
-        >
-          <LeftOutlined />
-        </Button>
-      </Col>
       <PhoneNumberFormatter>
         {conversation && conversation.phone_num}
       </PhoneNumberFormatter>
@@ -40,5 +23,3 @@ function ChatConversationTitle({ conversation, setSelectedConversation }) {
     </Space>
   );
 }
-
-export default connect(null, mapDispatchToProps)(ChatConversationTitle);
diff --git a/client/src/components/chat-popup/chat-popup.component.jsx b/client/src/components/chat-popup/chat-popup.component.jsx
index 58065cd76..6d582bdab 100644
--- a/client/src/components/chat-popup/chat-popup.component.jsx
+++ b/client/src/components/chat-popup/chat-popup.component.jsx
@@ -112,7 +112,7 @@ export function ChatPopupComponent({
             />
 
             <Row gutter={[8, 8]} className="chat-popup-content">
-              <Col span={8} sm={8} xs={selectedConversation && 0}>
+              <Col span={8}>
                 {loading ? (
                   <LoadingSpinner />
                 ) : (
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 6e469cb57..b48deb3b5 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -108,12 +108,7 @@ export function JobsConvertButton({
             },
           ]}
         >
-          <Select
-            showSearch
-            filterOption={(input, option) => {
-              return option.value.toLowerCase().includes(input.toLowerCase());
-            }}
-          >
+          <Select>
             {bodyshop.md_ins_cos.map((s, i) => (
               <Select.Option key={i} value={s.name}>
                 {s.name}