diff --git a/app/assets/javascripts/navigation.js b/app/assets/javascripts/navigation.js
index 01706bc08..7388bd3e3 100644
--- a/app/assets/javascripts/navigation.js
+++ b/app/assets/javascripts/navigation.js
@@ -90,11 +90,9 @@
 
     ps = new PerfectScrollbar(teamContainter, { scrollYMarginOffset: 5 });
     teamSwitch.click(() => {
-      dropDownHeight = dropDownMenu.height();
       if (teamSwitch.find('.new-team').length === 0) {
         teamSwitch.find('.edit_user').css('height', '100%');
       }
-      dropDownMenu.css('height', (dropDownHeight + 'px'));
       setTimeout(() => {
         ps.update();
       }, 0);
diff --git a/app/assets/stylesheets/themes/main_navigation.scss b/app/assets/stylesheets/themes/main_navigation.scss
index db853f2e2..faeca060b 100644
--- a/app/assets/stylesheets/themes/main_navigation.scss
+++ b/app/assets/stylesheets/themes/main_navigation.scss
@@ -311,8 +311,10 @@
 
   .dropdown-menu {
     border-radius: 0;
+    height: auto;
     margin-top: 0;
     max-height: calc(100vh - 50px);
+    overflow: scroll;
     padding-bottom: 0;
     padding-top: 0;
     width: 100%;
diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index 0a8a8758d..dc295e203 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -88,7 +88,7 @@
                     <% end %>
                   </div>
                 <% end %>
-                <% if current_user.teams.length > 1 && can_create_teams? %>
+                <% if can_create_teams? %>
                   <li class="new-team">
                     <%= link_to new_team_path do %>
                       <span class="fas fa-plus"></span>