diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
index 92acef47e403c4ec10f92c03afa0087a9bc3f2c1..c9767d34445141716a233833a196c5a27e93c6bf 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
@@ -50,6 +50,7 @@ public class DesktopSearchController implements EventHandler<ActionEvent> {
 
 		if (searchResult.isEmpty()) {
 			mainView.showInfoMessage(Localization.getString(Strings.Search_Alert_NoMatches), PlayPadMain.stageIcon.orElse(null));
+			return;
 		}
 
 		if (currentIndex < searchResult.size()) {
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index c3c5b6de9d258d20bb7ab5253198d655acaf7c33..6564b5343400488070c014f89aafe80f629c988b 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -43,6 +43,11 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
 		icon.setSize(35);
 	}
 
+	@Override
+	public void init() {
+		volumeSlider.focusedProperty().addListener(i -> mainViewController.getParent().requestFocus());
+	}
+
 	@Override
 	public void initPageButtons() {
 		pageHBox.getChildren().clear();