diff --git a/.config/hypr/config/WindowRules.conf b/.config/hypr/config/WindowRules.conf
index 3931ffd..0f0a09b 100644
--- a/.config/hypr/config/WindowRules.conf
+++ b/.config/hypr/config/WindowRules.conf
@@ -36,7 +36,6 @@ windowrule = workspace 1, class:^([Tt]horium-browser|[Cc]achy-browser)$
 windowrule = workspace 1, class:^(zen)$ # zen browser
 windowrule = workspace 1, class:thunderbird
 windowrule = workspace 2, class:^(kitty)$
-windowrule = workspace 2, class:^(com.mitchellh.ghostty)$
 windowrule = workspace 3, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
 windowrule = workspace 3, class:^([Bb]eeperTexts)$
 windowrule = workspace 3, class:^([Ff]erdium)$
@@ -84,7 +83,7 @@ windowrule = float, title:^(hyprgui)$
 windowrule = float, class:^(io.ente.auth)$
 windowrule = float, class:^(org.rncbc.qjackctl)$
 windowrule = float, class:^(blobdrop)$
-windowrule = float, title:yazi_hyprdrop
+windowrule = float, title:yazi.*
 windowrule = float, title:term_hyprdrop
 windowrule = float, class:Bitwarden
 windowrule = float, class:org.kde.kdeconnect.daemon
@@ -107,7 +106,7 @@ windowrule = size 60% 70%, title:^(ROG Control)$
 windowrule = size 60% 70%, title:^(hyprgui)$
 windowrule = size 240px 450px, class:^(libresplit)$
 windowrule = size 500px 1000px, class:^(io.ente.auth)$
-windowrule = size 60% 70%, title:yazi_hyprdrop
+windowrule = size 60% 70%, title:yazi.*
 windowrule = size 99% 30%, title:term_hyprdrop
 windowrule = size 40% 70%, class:Bitwarden
 
diff --git a/.config/xdg-desktop-portal-termfilechooser/config b/.config/xdg-desktop-portal-termfilechooser/config
index 749fedf..70038a2 100755
--- a/.config/xdg-desktop-portal-termfilechooser/config
+++ b/.config/xdg-desktop-portal-termfilechooser/config
@@ -2,7 +2,7 @@
 cmd=yazi-wrapper.sh
 default_dir=$HOME
 ; Uncomment and edit the line below to change the terminal emulator command
-env=TERMCMD="ghostty --class=\"YAZI-FILECHOOSER\" -e"
+env=TERMCMD="ghostty --title=\"yazi-filechooser\" -e"
 ; Mode must be one of 'suggested', 'default', or 'last'.
 open_mode=suggested
 save_mode=suggested