diff --git a/config/shell/.config/fish/post.d/ghostty.fish b/config/shell/.config/fish/post.d/ghostty.fish
index f4253e3..d68fc15 100644
--- a/config/shell/.config/fish/post.d/ghostty.fish
+++ b/config/shell/.config/fish/post.d/ghostty.fish
@@ -1,4 +1,4 @@
-if string match -q '*ghostty*' $TERM && test $XDG_CURRENT_DESKTOP = niri
+if string match -q '*ghostty*' $TERM; and test -n "$XDG_CURRENT_DESKTOP"; and test "$XDG_CURRENT_DESKTOP" = "niri"
     if test "$ghostty_niri_initialized" != "1"
         set -xg ghostty_niri_initialized 1
         niri msg action set-column-width 50%