diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java b/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
index 000a86eb71df201c53943348ac2fd3109157a30c..bff5ffeecf364dda35088b2264c3e57dc8a93f78 100644
--- a/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
+++ b/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
@@ -12,6 +12,7 @@ import javafx.event.EventHandler;
 import javafx.scene.Scene;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.VBox;
 
 public class KeyboardHandler implements EventHandler<KeyEvent> {
 
@@ -28,7 +29,7 @@ public class KeyboardHandler implements EventHandler<KeyEvent> {
 	// KeyType ist nicht unterstützt.
 	@Override
 	public void handle(KeyEvent event) {
-		if (event.getTarget() instanceof Scene) {
+		if (event.getTarget() == mainViewController.getParent()) {
 			if (!event.isShortcutDown()) {
 				KeyCode code = null;
 				InputType type = null;
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index d903d1174ab2bfbc8971f0524c28d673afc9a9b0..eed8a9297df47c2903489d4c9ff3427edb2941c8 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -224,6 +224,8 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
 		});
 
 		iconHbox.getChildren().add(editButtons);
+
+		volumeSlider.focusedProperty().addListener(i -> mainViewController.getParent().requestFocus());
 	}
 
 	// Desktop Edit Mode Change Listener --> Update Button
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
index 797e8196d0e14d37858178cf52674e6cec1eed3d..2070939aa4d484e6d594b29f49e64484e1470e96 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
@@ -202,6 +202,9 @@ public class MainViewController extends NVC implements IMainViewController, Noti
 		this.midiHandler = new MidiHandler(midi, this, project);
 		this.midi.setListener(midiHandler);
 		this.keyboardHandler = new KeyboardHandler(project, this);
+
+		// Request Focus for key listener
+		getParent().requestFocus();
 	}
 
 	private void initMainLayout() {