diff --git a/personal-gui/wm/sway.nix b/personal-gui/wm/sway.nix
index eb70932..11df013 100644
--- a/personal-gui/wm/sway.nix
+++ b/personal-gui/wm/sway.nix
@@ -36,6 +36,7 @@ in {
       MOZ_ENABLE_WAYLAND = "1";
       XDG_CURRENT_DESKTOP = "sway";
       LIBSEAT_BACKEND = "logind";
+      _JAVA_AWT_WM_NONREPARENTING = 1;
     };
 
     programs.rofi.package = pkgs.rofi-wayland;
@@ -166,6 +167,16 @@ in {
         fonts = common.mkFont cfg.font;
         window = {
           titlebar = true;
+          commands = [
+            {
+              criteria.class = "davmail-DavGateway";
+              command = "floating enable";
+            }
+            {
+              criteria.window_type = "menu";
+              command = "floating enable";
+            }
+          ];
         };
         keybindings = common.keybindings;
         workspaceOutputAssign = common.workspaceOutputAssign;