diff --git a/yabai/yabairc b/yabai/yabairc
index 6b09c12..e36b01c 100644
--- a/yabai/yabairc
+++ b/yabai/yabairc
@@ -19,9 +19,26 @@ yabai -m rule --add title='^Archive Utility$' manage=off
 
 # float JetBrains pop-ups (matches windows without titles)
 
-yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" role="AXDialog" manage=off
-yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" subrole="AXStandardWindow" manage=off
-
+yabai -m rule --add app="^IntelliJ IDEA$" title="^Welcome to IntelliJ IDEA$" manage=off
+yabai -m rule --add app="^WebStorm$" title="^Welcome to WebStorm$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Add File to Git$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Delete$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Push Commits" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Update Project$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^New Project$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Clone Repository$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Project Structure$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Settings$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Run/Debug Configurations$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Data Sources and Drivers$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Choose Plugins to Install or Enable$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Create New Branch$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Copy$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Rename$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Rename Branch" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Rollback Changes$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Copy Files/Directory$" manage=off
+yabai -m rule --add app="^(IntelliJ IDEA|WebStorm)$" title="^Choose Package$" manage=off
 # float settings windows
 yabai -m rule --add title='Settings$' manage=off
 
@@ -52,3 +69,4 @@ yabai -m signal --add event=application_activated action="zsh ~/.config/yabai/ap
 yabai -m signal --add event=window_created action="zsh ~/.config/yabai/window-created.zsh"
 
 echo "yabai configuration loaded.."
+