diff --git a/public/app/core/components/OrgSwitcher.tsx b/public/app/core/components/OrgSwitcher.tsx
index c4dd88d38ec..aa86c5dedb3 100644
--- a/public/app/core/components/OrgSwitcher.tsx
+++ b/public/app/core/components/OrgSwitcher.tsx
@@ -9,7 +9,6 @@ import config from 'app/core/config';
 
 interface Props {
   onDismiss: () => void;
-  isOpen: boolean;
 }
 
 interface State {
@@ -42,13 +41,13 @@ export class OrgSwitcher extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { onDismiss, isOpen } = this.props;
+    const { onDismiss } = this.props;
     const { orgs } = this.state;
 
     const currentOrgId = contextSrv.user.orgId;
 
     return (
-      <Modal title="Switch Organization" icon="random" onDismiss={onDismiss} isOpen={isOpen}>
+      <Modal title="Switch Organization" icon="random" onDismiss={onDismiss} isOpen={true}>
         <table className="filter-table form-inline">
           <thead>
             <tr>
diff --git a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
index 747ad8f0367..804cffc7f80 100644
--- a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
+++ b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
@@ -48,6 +48,7 @@ describe('Render', () => {
       },
     });
 
+    wrapper.find('.sidemenu-org-switcher a').simulate('click');
     expect(wrapper).toMatchSnapshot();
   });
 
diff --git a/public/app/core/components/sidemenu/BottomNavLinks.tsx b/public/app/core/components/sidemenu/BottomNavLinks.tsx
index 1a3790e06ef..3210a642e28 100644
--- a/public/app/core/components/sidemenu/BottomNavLinks.tsx
+++ b/public/app/core/components/sidemenu/BottomNavLinks.tsx
@@ -67,7 +67,7 @@ class BottomNavLinks extends PureComponent<Props, State> {
             </li>
           )}
 
-          <OrgSwitcher onDismiss={this.toggleSwitcherModal} isOpen={showSwitcherModal} />
+          {showSwitcherModal && <OrgSwitcher onDismiss={this.toggleSwitcherModal} />}
 
           {link.children &&
             link.children.map((child, index) => {
diff --git a/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
index 3c81e496f7e..be720cf3023 100644
--- a/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
+++ b/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
@@ -15,10 +15,6 @@ exports[`Render should render children 1`] = `
     className="dropdown-menu dropdown-menu--sidemenu"
     role="menu"
   >
-    <OrgSwitcher
-      isOpen={false}
-      onDismiss={[Function]}
-    />
     <li
       key="undefined-0"
     >
@@ -66,10 +62,6 @@ exports[`Render should render component 1`] = `
     className="dropdown-menu dropdown-menu--sidemenu"
     role="menu"
   >
-    <OrgSwitcher
-      isOpen={false}
-      onDismiss={[Function]}
-    />
     <li
       className="side-menu-header"
     >
@@ -127,7 +119,6 @@ exports[`Render should render organization switcher 1`] = `
       </a>
     </li>
     <OrgSwitcher
-      isOpen={false}
       onDismiss={[Function]}
     />
     <li
@@ -165,10 +156,6 @@ exports[`Render should render subtitle 1`] = `
         subtitle
       </span>
     </li>
-    <OrgSwitcher
-      isOpen={false}
-      onDismiss={[Function]}
-    />
     <li
       className="side-menu-header"
     >
diff --git a/public/app/core/specs/OrgSwitcher.test.tsx b/public/app/core/specs/OrgSwitcher.test.tsx
index 3f86a45ffea..6d92221bba6 100644
--- a/public/app/core/specs/OrgSwitcher.test.tsx
+++ b/public/app/core/specs/OrgSwitcher.test.tsx
@@ -33,7 +33,7 @@ let orgSwitcher: OrgSwitcher;
 describe('OrgSwitcher', () => {
   describe('when switching org', () => {
     beforeEach(async () => {
-      wrapper = shallow(<OrgSwitcher onDismiss={() => {}} isOpen={true} />);
+      wrapper = shallow(<OrgSwitcher onDismiss={() => {}} />);
       orgSwitcher = wrapper.instance() as OrgSwitcher;
       orgSwitcher.setWindowLocation = jest.fn();
       wrapper.update();