diff --git a/README.md b/README.md
index de0c30e..0ec9c98 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,12 @@ It additionally helps you discover new ones.
 
 * firefox 32 issues
 * linux super key issues
-* test on real windows + linux
+* meta-alt-L produces wrong combination
 * fix select tab 1-8 and last tab shortcuts (on linux?)
 
+* Pressing Alt key on Windows removes the Meta key
+
+
 # TODO
 
 * localization
diff --git a/customizable-shortcuts.xpi b/customizable-shortcuts.xpi
index bdd16a1..546ec8e 100644
Binary files a/customizable-shortcuts.xpi and b/customizable-shortcuts.xpi differ
diff --git a/data/panel.js b/data/panel.js
index 91430e3..d175fe6 100644
--- a/data/panel.js
+++ b/data/panel.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const MODIFIER_KEYS = {16: "shift", 17: "control", 18: "alt", 224: "meta"};
+const MODIFIER_KEYS = {16: "shift", 17: "control", 18: "alt", 91: "meta", 92: "meta", 224: "meta"};
 const MODIFIER_NAMES = {control: "Ctrl", meta: "Meta", shift: "Shift", alt: "Alt"};
 
 // Notify the parent that we're ready.
diff --git a/lib/keys.js b/lib/keys.js
index d59d139..bbb8d5c 100644
--- a/lib/keys.js
+++ b/lib/keys.js
@@ -83,7 +83,7 @@ function valueForKeyCode(keyCode) {
   return Ci.nsIDOMKeyEvent["DOM_" + keyCode] || null;
 }
 
-const MODIFIER_KEYS = {16: "shift", 17: "control", 18: "alt", 224: "meta"};
+const MODIFIER_KEYS = {16: "shift", 17: "control", 18: "alt", 91: "meta", 92: "meta", 224: "meta"};
 
 function parseModifiers(attr) {
   let modifiers = attr.toLowerCase().split(/[,\s]/);
diff --git a/lib/main.js b/lib/main.js
index b1dfa69..1e151da 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -83,7 +83,7 @@ panel.port.on("overlays", function (overlays) {
   storage.overlays = gOverlays = overlays;
 });
 
-const MODIFIER_KEYS = {16: "shift", 17: "control", 18: "alt", 224: "meta"};
+const MODIFIER_KEYS = {16: "shift", 17: "control", 18: "alt", 91: "meta", 92: "meta", 224: "meta"};
 
 function modifiersFromEvent(event) {
   let modifiers = [];