diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/themes/luna/rules.conf
index 458234c1..40dd911e 100644
--- a/.config/hypr/themes/luna/rules.conf
+++ b/.config/hypr/themes/luna/rules.conf
@@ -48,7 +48,6 @@ windowrule = float, nm-connection-editor
 
 ## Other
 windowrulev2 = center,class:^(kitty)$
-# windowrulev2 = stayfocused,class:quake
 windowrulev2 = opacity 0.80, class:^(Rofi)$
 windowrule = animation slide, Rofi
 windowrulev2 = animation windowsOut, 0, class:(wleave)
@@ -56,8 +55,9 @@ windowrule = float, keyb-kitty
 windowrule = center 1, keyb-kitty
 windowrule = size 35% 80%, keyb-kitty
 windowrule = size 30% 85%,^(pavucontrol)$
-windowrule = size 80% 80%,^(Geeqie)$
-windowrule = center 1, ^(Geeqie)$
+windowrule = float, ^(yazi-geeqie)$
+windowrule = size 80% 80%,^(yazi-geeqie)$
+windowrule = center 1, ^(yazi-geeqie)$
 windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
 windowrulev2 = noanim,class:^(xwaylandvideobridge)$
 windowrulev2 = nofocus,class:^(xwaylandvideobridge)$
diff --git a/.config/yazi/yazi.toml b/.config/yazi/yazi.toml
index c78827fe..594e91c2 100644
--- a/.config/yazi/yazi.toml
+++ b/.config/yazi/yazi.toml
@@ -21,7 +21,7 @@ archive = [{ exec = 'xarchiver "$1"', desc = "Extract here" }]
 pdf = [{ exec = 'zathura "$1"', desc = "Open" }]
 text = [{ exec = '$EDITOR "$@"', block = true }]
 image = [
-  { exec = 'geeqie "$@"', desc = "Open" },
+  { exec = 'geeqie --class yazi-geeqie "$@"', desc = "Open" },
   { exec = '''exiftool "$1"; echo "Press enter to exit"; read''', block = true, desc = "Show EXIF" },
 ]
 video = [