diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index ce0979d68..3c09885fc 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -25,7 +25,9 @@
           track-by="id"
           @select="assignAgent"
           @remove="removeAgent"
-        />
+        >
+          <span slot="noResult">{{ $t('AGENT_MGMT.SEARCH.NO_RESULTS') }}</span>
+        </multiselect>
       </div>
       <ResolveButton />
     </div>
diff --git a/app/javascript/dashboard/i18n/locale/en/agentMgmt.json b/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
index 1fb1ee93d..3b64401ec 100644
--- a/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
@@ -84,6 +84,9 @@
         "SUCCESS_MESSAGE": "Agent updated successfully",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       }
+    },
+    "SEARCH": {
+      "NO_RESULTS": "No agents found."
     }
   }
 }
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index d67a6375f..f5d031279 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -23,6 +23,10 @@ export default {
 
   methods: {
     ...mapActions('conversation', ['fetchOldConversations']),
+    scrollConversationToBottom() {
+      const container = this.$el.querySelector('.conversation-wrap');
+      container.scrollTop = container.scrollHeight;
+    },
   },
 
   mounted() {
@@ -46,6 +50,8 @@ export default {
       const message = JSON.parse(e.data.replace('chatwoot-widget:', ''));
       if (message.event === 'config-set') {
         this.fetchOldConversations();
+      } else if (message.event === 'widget-visible') {
+        this.scrollConversationToBottom();
       }
     });
   },