diff --git a/.config/sway/config b/.config/sway/config
index a2d04f9..97906a9 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -117,6 +117,10 @@ bindsym
 	$mod+shift+m exec swaymsg output $(swaymsg -p -t get_outputs | grep Output | head -n2 | tail -n1 | sed -e 's/Output //g' -e 's/ ''.*$//g') toggle
 }
 for_window [app_id="^launcher$"] floating enable, border none, resize set width 25 ppt height 100 ppt, move position 0 px 0 px
+for_window [window_role="pop-up"] floating enable
+for_window [window_role="bubble"] floating enable
+for_window [window_role="dialog"] floating enable
+for_window [window_type="dialog"] floating enable
 
 input *
 {
@@ -138,7 +142,7 @@ input 1102:4619:DLL07A7:01_044E:120B
 
 focus_follows_mouse yes
 focus_wrapping false
-popup_during_fullscreen leave_fullscreen
+popup_during_fullscreen smart
 
 
 #--- Floating Windows ------------------------------------------------------
@@ -177,7 +181,7 @@ for_window [app_id="gnome-.*"]		border pixel 1
 for_window [app_id="qterminal"]		border pixel 2
 for_window [app_id="xterm"]		border pixel 2
 for_window [title=".*Brave.*"]		border pixel 1 inhibit_idle fullscreen
-for_window [title=".*Firefox.*"]	border pixel 2 inhibit_idle fullscreen
+for_window [title=".*Firefox.*"]	border none inhibit_idle fullscreen
 for_window [class="vlc"]		border pixel 2 inhibit_idle fullscreen
 for_window [app_id="vlc"]		border pixel 2 inhibit_idle fullscreen
 for_window [app_id="nautilus"]		border pixel 1