diff --git a/webmusic.js b/webmusic.js
index ab01afd..24de390 100644
--- a/webmusic.js
+++ b/webmusic.js
@@ -20,9 +20,13 @@ window.onload = function () {
     updateState()
 };
 
-document.addEventListener("keypress", function onEvent(event) {
-    if (event.key === "p") {
-        togglePlayback();
+window.onkeyup = function (event) {
+    if (event.key === " " || event.key === "p") {
+        if (gstate !== "idle") {
+            togglePlayback();
+        } else {
+            playSong(queue[0])
+        }
     }
     else if (event.key === "r") {
         toggleRepeat();
@@ -30,7 +34,23 @@ document.addEventListener("keypress", function onEvent(event) {
     else if (event.key === "c") {
         toggleContinue();
     }
-});
+    else if (event.key === "ArrowUp") {
+        previousTrack();
+    }
+    else if (event.key === "ArrowDown") {
+        nextTrack();
+    }
+    else if (event.key === "ArrowLeft") {
+        if (sound.seek() < 10) {
+            sound.seek(0);
+        } else {
+            sound.seek(sound.seek()-10);
+        }
+    }
+    else if (event.key === "ArrowRight") {
+        sound.seek(sound.seek()+10);
+    }
+};
 
 
 function togglePlayback() {