diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index 2a2f6f2..407ef92 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -236,7 +236,7 @@ function removeTrack() {
     }
     var track = {};
     track.uri = [currentplaylist[i].uri];
-    mopidy.tracklist.remove(track);
+    mopidy.tracklist.remove({'uri':track.uri});
     //    console.log(currentplaylist[i].uri);
 }
 
diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
index cbbf178..2ef16c1 100644
--- a/mopidy_musicbox_webclient/static/js/gui.js
+++ b/mopidy_musicbox_webclient/static/js/gui.js
@@ -508,17 +508,21 @@ $(document).ready(function(event) {
 
     $(document).keypress( function (event) {
 	//console.log('kp:    '+event);
-	if (event.target.tagName != 'INPUT') { 
-	    event.preventDefault();
-	    switch(event.which) {
-	        case 32:
+	if (event.target.tagName != 'INPUT') {
+	    var unicode=event.keyCode? event.keyCode : event.charCode;
+	    var actualkey=String.fromCharCode(unicode);
+	    switch(actualkey) {
+	        case ' ':
     		    doPlay();
+    		    event.preventDefault();
 		    break;
 		case '>':
     		    doNext();
+    		    event.preventDefault();
 		    break;
 		case '<':
     		    doPrevious();
+    		    event.preventDefault();
 		    break;
 	    }
 	    return true;