diff --git a/js/KeyManager.js b/js/KeyManager.js
index d0222b38..e6eef300 100644
--- a/js/KeyManager.js
+++ b/js/KeyManager.js
@@ -2,7 +2,7 @@
 	var ns = $.namespace("pskl");
 
 	ns.KeyManager = function () {
-		$(document.body).keyup($.proxy(this.onKeyUp_, this));
+		$(document.body).keydown($.proxy(this.onKeyUp_, this));
 	};
 
 	// Kind of object that make you want to stop front-end _engineering_:
@@ -29,14 +29,13 @@
 	
 
 	ns.KeyManager.prototype.onKeyUp_ = function(evt) {
-		//var isMac = false;
-		//if (navigator.appVersion.indexOf("Mac")!=-1) {
+		var isMac = false;
+		if (navigator.appVersion.indexOf("Mac")!=-1) {
 			// Welcome in mac world where vowels are consons and meta used instead of ctrl:
-		//	isMac = true;
-		//}
-
-		// (isMac ? evt.metaKey : evt.ctrlKey) {
-		if (evt.ctrlKey) {
+			isMac = true;
+		}
+		
+		if (isMac ? evt.metaKey : evt.ctrlKey) {
 			// Get key pressed:
  			var letter = this.CharCodeToKeyCodeMap[evt.which];
 			if(letter) {