diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx
index b9dea4370a..1e7711d2cc 100644
--- a/webapp/components/navbar.jsx
+++ b/webapp/components/navbar.jsx
@@ -180,9 +180,7 @@ export default class Navbar extends React.Component {
     showChannelSwitchModal(e) {
         if (Utils.cmdOrCtrlPressed(e) && e.keyCode === Constants.KeyCodes.K) {
             e.preventDefault();
-            this.setState({
-                showChannelSwitchModal: true
-            });
+            this.setState({showChannelSwitchModal: !this.state.showChannelSwitchModal});
         }
     }
 
diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx
index 8eb0a93a9c..4912b8ebf6 100644
--- a/webapp/components/navbar_dropdown.jsx
+++ b/webapp/components/navbar_dropdown.jsx
@@ -77,7 +77,7 @@ export default class NavbarDropdown extends React.Component {
     openAccountSettings(e) {
         if (Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.keyCode === Constants.KeyCodes.A) {
             e.preventDefault();
-            this.setState({showUserSettingsModal: true});
+            this.setState({showUserSettingsModal: !this.state.showUserSettingsModal});
         }
     }