diff --git a/core/input/devices.js b/core/input/devices.js
index 575d57ac..ae09c7f8 100644
--- a/core/input/devices.js
+++ b/core/input/devices.js
@@ -106,7 +106,10 @@ Keyboard.prototype = {
         // (don't use it for 'keypress' events thought since
         // WebKit sets it to the same as charCode)
         if (e.keyCode && (e.type !== 'keypress')) {
-            return 'Platform' + e.keyCode;
+            // 229 is used for composition events
+            if (e.keyCode !== 229) {
+                return 'Platform' + e.keyCode;
+            }
         }
 
         // A precursor to the final DOM3 standard. Unfortunately it
diff --git a/tests/test.keyboard.js b/tests/test.keyboard.js
index 4fcd2fea..3585591c 100644
--- a/tests/test.keyboard.js
+++ b/tests/test.keyboard.js
@@ -284,6 +284,14 @@ describe('Key Event Handling', function() {
                 kbd._handleKeyDown(keyevent('keydown', {keyCode: 65, key: 'a'}));
                 kbd._handleKeyUp(keyevent('keyup', {keyCode: 65, key: 'b'}));
             });
+            it('should ignore compositing code', function() {
+                var kbd = new Keyboard({
+                onKeyEvent: function(keysym, code, down) {
+                    expect(keysym).to.be.equal(0x61);
+                    expect(code).to.be.equal('Unidentified');
+                }});
+                kbd._handleKeyDown(keyevent('keydown', {keyCode: 229, key: 'a'}));
+            });
             it('should track keys using keyIdentifier if no code', function(done) {
                 var kbd = new Keyboard({
                 onKeyEvent: function(keysym, code, down) {