diff --git a/client/lib/keyboard.js b/client/lib/keyboard.js
index ff18738ba..24955929d 100755
--- a/client/lib/keyboard.js
+++ b/client/lib/keyboard.js
@@ -6,7 +6,11 @@ Mousetrap.bind('?', () => {
 });
 
 Mousetrap.bind('w', () => {
-  Sidebar.toggle();
+  if (Sidebar.isOpen() && Sidebar.getView() === 'home') {
+    Sidebar.toggle();
+  } else {
+    Sidebar.setView();
+  }
 });
 
 Mousetrap.bind('q', () => {