diff --git a/.config/scripts/rofiSelectWallpaper.sh b/.config/scripts/rofiSelectWallpaper.sh
index 50c845e..5ba18eb 100755
--- a/.config/scripts/rofiSelectWallpaper.sh
+++ b/.config/scripts/rofiSelectWallpaper.sh
@@ -1,4 +1,6 @@
-availablewallpaper=$(ls ~/.config/assets/wallpaper/)
-availablewallpaper=$(sed "s_ _\n_g" <<<$availablewallpaper)
-chosenwallpaper=$(echo $availablewallpaper | sed "s_ _\n_g" | rofi -dmenu)
-~/.config/scripts/set-wallpaper.sh ~/.config/assets/wallpaper/$chosenwallpaper
+shopt -s extglob
+chosenwallpaper=$(for a in ~/.config/assets/wallpaper/?(*.jpg|*.png); do echo -en "$(sed "s_.*wallpaper/\(.*\)-wallpaper.\w*_\1_" <<<$a)\0icon\x1f$a\n"; done | rofi -dmenu -p "Select Wallpaper")
+if [[ ! -z $chosenwallpaper ]]; then
+  chosenwallpaperpath=$(ls ~/.config/assets/wallpaper/$chosenwallpaper-wallpaper.*)
+  ~/.config/scripts/set-wallpaper.sh $chosenwallpaperpath
+fi