diff --git a/styles/elements/_menu.scss b/styles/elements/_menu.scss
index ca7953db..7c18bc62 100644
--- a/styles/elements/_menu.scss
+++ b/styles/elements/_menu.scss
@@ -42,6 +42,13 @@
     }
   }
 
+  .menu__message {
+    @include h5;
+    font-weight: normal;
+    font-style: italic;
+    padding: 0 ($gap * 2);
+  }
+
   .menu__button {
     margin: ($gap * 2) ($gap * 2) 0;
     white-space: nowrap;
diff --git a/templates/navigation/topbar.html b/templates/navigation/topbar.html
index b4fcabee..2550c4be 100644
--- a/templates/navigation/topbar.html
+++ b/templates/navigation/topbar.html
@@ -15,7 +15,6 @@
 
     <div class="topbar__context {% if workspace %}topbar__context--workspace{% endif %}">
       {% if workspace %}
-        {% if workspaces %}
 
           <div is='toggler' class='topbar__workspace-menu'>
             <template slot-scope='props'>
@@ -30,30 +29,30 @@
 
               <div v-show='props.isVisible' class='topbar__workspace-menu__panel menu'>
                 <h2 class='menu__heading'>Other Active Workspaces</h2>
-                <ul class='menu__list'>
-                  {% for other_workspace in workspaces %}
-                    <li class='menu__list__item'>
-                      <a href="{{ url_for('workspaces.show_workspace', workspace_id=other_workspace.id)}}">
-                        {{ other_workspace.name }}
-                        {{ Icon('caret_right', classes='topbar__link-icon') }}
-                      </a>
-                    </li>
-                  {% endfor %}
-                </ul>
+                {% if workspaces %}
+
+                  <ul class='menu__list'>
+                    {% for other_workspace in workspaces %}
+                      <li class='menu__list__item'>
+                        <a href="{{ url_for('workspaces.show_workspace', workspace_id=other_workspace.id)}}">
+                          {{ other_workspace.name }}
+                          {{ Icon('caret_right', classes='topbar__link-icon') }}
+                        </a>
+                      </li>
+                    {% endfor %}
+                  </ul>
+
+                {% else %}
+
+                  <p class='menu__message'>You have no other active JEDI workspaces.</p>
+
+                {% endif %}
+
                 <a href="{{ url_for('requests.requests_form_new', screen=1) }}" class='menu__button usa-button'>Request a new JEDI Workspace</a>
               </div>
             </template>
           </div>
 
-        {% else %}
-
-          <div class='topbar__workspace-menu'>
-            <a class="topbar__link" href="{{ url_for('workspaces.show_workspace', workspace_id=workspace.id)}}">
-              <span class="topbar__link-label">{{ ("Workspace " + workspace.name) }}</span>
-            </a>
-          </div>
-
-        {% endif %}
       {% endif %}
 
       <a href="{{ url_for('atst.user') }}" class="topbar__link">