diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs
index 8a0e721c..2936b526 100644
--- a/nix/configurations/vanadium/home/xmonad/xmonad.hs
+++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs
@@ -85,6 +85,9 @@ isDiscord =
 isEvolution :: Query Bool
 isEvolution = className ~? "gnome.Evolution"
 
+isEvolutionComposer :: Query Bool
+isEvolutionComposer = isEvolution <&&> title =? "Compose Message"
+
 isFirefox :: Query Bool
 isFirefox = className =? "firefox"
 
@@ -136,17 +139,20 @@ myActivateHook =
 
 myManageHook :: ManageHook
 myManageHook =
-  composeOne
-    [ isNautilusPreviewer      -?> customFloating centeredFloat
-    , isFeh                    -?> doF copyToAll <> customFloating buttomRightFloat
-    , isMinder                 -?> customFloating centeredFloat
-    , isFirefoxPip             -?> doF copyToAll <> customFloating buttomRightFloat
-    , isDiscord                -?> doShift chatWS
-    , isEvolution              -?> doShift chatWS
-    , isSignal                 -?> doShift chatWS
-    , isFirefox                -?> insertPosition Master Newer
-    , isKitty                  -?> insertPosition Below Newer
-    , isNautilus <||> isSioyek -?> insertPosition End Older
+  composeAll
+    [ isNautilusPreviewer      --> customFloating centeredFloat
+    , isFeh                    --> doF copyToAll <> customFloating buttomRightFloat
+    , isMinder                 --> customFloating centeredFloat
+    , isFirefoxPip             --> doF copyToAll <> customFloating buttomRightFloat
+    , isDiscord                --> doShift chatWS
+    , isEvolution              --> doShift chatWS
+    , isSignal                 --> doShift chatWS
+    , isFirefox                --> insertPosition Master Newer
+    , isKitty                  --> insertPosition Below Newer
+    , isNautilus <||> isSioyek --> insertPosition End Older
+
+    , isDialog                 --> doF copyToAll <> customFloating centeredFloat
+    , isEvolutionComposer      --> customFloating centeredFloat
     ]
   <> namedScratchpadManageHook myScratchpads