diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
index 514090b942..1989a7a1f3 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -67,7 +67,12 @@ export default class extends React.Component {
         eventKey={ 1 }
         to='/map'>
         <NavItem
-          onClick={ toggleMapDrawer }
+          onClick={ e => {
+            if (!(e.ctrlKey || e.metaKey)) {
+              e.preventDefault();
+              toggleMapDrawer();
+            }
+          }}
           target='/map'
         >
           Map
@@ -81,7 +86,12 @@ export default class extends React.Component {
       <NavItem
         eventKey={ 2 }
         href='//gitter.im/freecodecamp/freecodecamp'
-        onClick={ toggleMainChat }
+        onClick={ e => {
+          if (!(e.ctrlKey || e.metaKey)) {
+            e.preventDefault();
+            toggleMainChat();
+          }
+        }}
         target='_blank'
       >
         Chat
diff --git a/common/app/redux/actions.js b/common/app/redux/actions.js
index f1cd0a43b1..abd323f8eb 100644
--- a/common/app/redux/actions.js
+++ b/common/app/redux/actions.js
@@ -49,18 +49,8 @@ export const createErrorObservable = error => Observable.just({
 
 
 // drawers
-export const toggleMapDrawer = createAction(
-  types.toggleMapDrawer,
-  e => e.preventDefault()
-);
+export const toggleMapDrawer = createAction(types.toggleMapDrawer);
 export const toggleWikiDrawer = createAction(types.toggleWikiDrawer);
 
 // chat
-export const toggleMainChat = createAction(
-  types.toggleMainChat,
-  e => {
-    if (!(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-    }
-  }
-);
+export const toggleMainChat = createAction(types.toggleMainChat);