diff --git a/modules/wp/WallpaperPicker.qml b/modules/wp/WallpaperPicker.qml
index 41065b0..a9e3304 100644
--- a/modules/wp/WallpaperPicker.qml
+++ b/modules/wp/WallpaperPicker.qml
@@ -63,13 +63,18 @@ PanelWindow {
                 border.color: filterText.activeFocus ? Colors.tertiary : Colors.primary
                 border.width: 1
             }
-                Keys.onReleased: {
-                    if (event.key === Qt.Key_Escape) {
-                        console.log("Escape pressed inside TextField")
-                        console.log("Pressed Escape, closing Wallpaper Picker")
-                        wallpaperLoader.active = false
-                    }
+
+            Keys.onReleased: {
+                if (event.key === Qt.Key_Escape) {
+                    console.log("Escape pressed inside TextField")
+                    console.log("Pressed Escape, closing Wallpaper Picker")
+                    // wallpaperLoader.active = false
+                    filterText.text = ""
+                    filterText.focus = false
+                    event.accepted = true
+                    pickerScope.focus = true
                 }
+            }
 
         }