diff --git a/web/src/settings_bots.js b/web/src/settings_bots.js
index af2f7acc32..0890750bee 100644
--- a/web/src/settings_bots.js
+++ b/web/src/settings_bots.js
@@ -176,10 +176,15 @@ export function update_bot_settings_tip($tip_container, for_org_settings) {
 function update_add_bot_button() {
     if (can_create_new_bots()) {
         $("#bot-settings .add-a-new-bot").show();
-        $("#admin-bot-list .add-a-new-bot").show();
+        $("#admin-bot-list .add-new-bots").show();
+        $("#admin-bot-list .manage-your-bots").hide();
     } else {
         $("#bot-settings .add-a-new-bot").hide();
-        $("#admin-bot-list .add-a-new-bot").hide();
+        $("#admin-bot-list .add-new-bots").hide();
+
+        if (bot_data.get_all_bots_for_current_user().length > 0) {
+            $("#admin-bot-list .manage-your-bots").show();
+        }
     }
 }
 
diff --git a/web/templates/settings/bot_list_admin.hbs b/web/templates/settings/bot_list_admin.hbs
index 46a07ccd0e..48d93f0995 100644
--- a/web/templates/settings/bot_list_admin.hbs
+++ b/web/templates/settings/bot_list_admin.hbs
@@ -4,18 +4,19 @@
     <div class="clear-float"></div>
     <div>
         {{t "You are viewing all the bots in this organization." }}
-        {{#if can_create_new_bots}}
+        <span class="add-new-bots" {{#unless can_create_new_bots}}style="display: none;"{{/unless}}>
             {{#tr}}
                 You can <z-link-new-bot>add a new bot</z-link-new-bot> or <z-link-manage-bot>manage</z-link-manage-bot> your own bots.
                 {{#*inline "z-link-new-bot"}}<a class="add-a-new-bot">{{> @partial-block}}</a>{{/inline}}
                 {{#*inline "z-link-manage-bot"}}<a href="/#settings/your-bots">{{> @partial-block}}</a>{{/inline}}
             {{/tr}}
-        {{else if has_bots}}
+        </span>
+        <span class="manage-your-bots" {{#unless (and (not can_create_new_bots) has_bots)}}style="display: none;"{{/unless}}>
             {{#tr}}
                 You can <z-link>manage</z-link> your own bots.
                 {{#*inline "z-link"}}<a href="/#settings/your-bots">{{> @partial-block}}</a>{{/inline}}
             {{/tr}}
-        {{/if}}
+        </span>
     </div>
     <div class="settings_panel_list_header">
         <h3>{{t "Bots"}}</h3>