diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 573656f6b552ab704fd9f1ad893286475dda5049..eccafc183acbddc53097dae4f91cf41f05d2b421 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -32,6 +32,7 @@
     <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginWebAPI" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginWebAPI/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginWebAPI/src/main/resources" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index 696d5b1430b785007cf369f918ba2b6455a6064c..58a192f4e1d5971d96f15b8eeab6c4a7bf564b24 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -66,6 +66,7 @@ import javafx.scene.control.MenuBar;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextField;
 import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
@@ -756,6 +757,12 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
 		NotificationPane pane = mainViewController.getNotificationPane();
 		pane.setOnShown(e -> searchField.requestFocus());
 		pane.show("", box);
+
+		searchField.setOnKeyPressed(e -> {
+			if (e.getCode() == KeyCode.ESCAPE) {
+				pane.hide();
+			}
+		});
 	}
 
 	@FXML