diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 5acceb1009..7a930fa233 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -85,6 +85,10 @@ var LeftPanel = React.createClass({
         let handled = false;
 
         switch (ev.keyCode) {
+            case KeyCode.TAB:
+                this._onMoveFocus(ev.shiftKey);
+                handled = true;
+                break;
             case KeyCode.UP:
                 this._onMoveFocus(true);
                 handled = true;