diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index ca7c0fbfb..578b6e821 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-on-clickaway="onClose" class="bulk-action__agents">
+  <div v-on-clickaway="onCloseAgentList" class="bulk-action__agents">
     <div class="triangle" :style="cssVars">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path
@@ -126,6 +126,7 @@ export default {
     return {
       query: '',
       selectedAgent: null,
+      goBackToAgentList: false,
     };
   },
   computed: {
@@ -169,6 +170,7 @@ export default {
       this.$emit('select', this.selectedAgent);
     },
     goBack() {
+      this.goBackToAgentList = true;
       this.selectedAgent = null;
     },
     assignAgent(agent) {
@@ -177,6 +179,12 @@ export default {
     onClose() {
       this.$emit('close');
     },
+    onCloseAgentList() {
+      if (this.selectedAgent === null && !this.goBackToAgentList) {
+        this.onClose();
+      }
+      this.goBackToAgentList = false;
+    },
   },
 };
 </script>