Merge branch 'master' into PopupNotifications

2 files changed, 11 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25f308d78..5cb0fc044 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Added static image as fallback for when WebGL isn't supported.
 - Transaction history now has a hard limit.
 - Added info link on account screen that visits Etherscan.
+- Added shortcut to open MetaMask (Ctrl+Alt+M or Cmd+Opt/Alt+M)
 
 ## 2.9.0 2016-08-22
 
diff --git a/app/manifest.json b/app/manifest.json
index 09bc9eb37..c1b9ee817 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -4,6 +4,16 @@
   "version": "2.9.0",
   "manifest_version": 2,
   "description": "Ethereum Browser Extension",
+  "commands": {
+    "_execute_browser_action": {
+      "suggested_key": {
+        "windows": "Ctrl+Alt+M",
+        "mac": "Command+Alt+M",
+        "chromeos": "Ctrl+Alt+M",
+        "linux": "Ctrl+Alt+M"
+      }
+    }
+  },
   "icons": {
     "16": "images/icon-16.png",
     "128": "images/icon-128.png"