1 files changed, 12 insertions, 6 deletions

diff --git a/webapp/components/sidebar_header_dropdown.jsx b/webapp/components/sidebar_header_dropdown.jsx
index 3b5380b06..5a7784733 100644
--- a/webapp/components/sidebar_header_dropdown.jsx
+++ b/webapp/components/sidebar_header_dropdown.jsx
@@ -78,9 +78,14 @@ export default class SidebarHeaderDropdown extends React.Component {
         }
     }
 
-    toggleDropdown(e) {
-        if (e) {
-            e.preventDefault();
+    toggleDropdown(val) {
+        if (typeof (val) === 'boolean') {
+            this.setState({showDropdown: val});
+            return;
+        }
+
+        if (val && val.preventDefault) {
+            val.preventDefault();
         }
 
         this.setState({showDropdown: !this.state.showDropdown});
@@ -161,7 +166,8 @@ export default class SidebarHeaderDropdown extends React.Component {
     onTeamChange() {
         this.setState({
             teamMembers: TeamStore.getMyTeamMembers(),
-            teamListings: TeamStore.getTeamListings()
+            teamListings: TeamStore.getTeamListings(),
+            showDropdown: false
         });
     }
 
@@ -596,8 +602,8 @@ export default class SidebarHeaderDropdown extends React.Component {
         return (
             <Dropdown
                 id='sidebar-header-dropdown'
-                defaultOpen={this.state.showDropdown}
-                onClose={this.toggleDropdown}
+                open={this.state.showDropdown}
+                onToggle={this.toggleDropdown}
                 className='sidebar-header-dropdown'
                 pullRight={true}
             >