diff --git a/src/components/BotList.vue b/src/components/BotList.vue
index 336ea7e8..17e96220 100644
--- a/src/components/BotList.vue
+++ b/src/components/BotList.vue
@@ -7,6 +7,7 @@
         :key="bot.botId"
         button
         :active="bot.botId === selectedBot"
+        :title="`${bot.botId} - ${bot.botName} - ${bot.botUrl}`"
         @click="selectBot(bot.botId)"
       >
         {{ bot.botName || bot.botId }}
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 2288a40b..624447fc 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -152,6 +152,7 @@ export default class Login extends Vue {
         this.addBot({
           botName: this.auth.botName,
           botId: this.nextBotId,
+          botUrl: this.auth.url,
         });
         // TODO: Investigate how this needs to be done properly
         // setBaseUrl(userService.getAPIUrl());
diff --git a/src/shared/userService.ts b/src/shared/userService.ts
index 881e8702..cf235b99 100644
--- a/src/shared/userService.ts
+++ b/src/shared/userService.ts
@@ -70,6 +70,7 @@ export class UserService {
       response[k] = {
         botId: k,
         botName: v.botName,
+        botUrl: v.apiUrl,
       };
     });
     return response;
diff --git a/src/types/auth.ts b/src/types/auth.ts
index 4de6158b..2ea06df7 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -19,6 +19,7 @@ export interface AuthStorageMulti {
 export interface BotDescriptor {
   botName: string;
   botId: string;
+  botUrl: string;
 }
 
 export interface BotDescriptors {