diff --git a/modules/user/browser/qutebrowser.nix b/modules/user/browser/qutebrowser.nix
index 8db0820b..1ba4491d 100644
--- a/modules/user/browser/qutebrowser.nix
+++ b/modules/user/browser/qutebrowser.nix
@@ -261,9 +261,9 @@ config.set('downloads.position', 'bottom')
 config.set('downloads.remove_finished', 5000)
 
 config.set('fileselect.handler', 'external')
-config.set('fileselect.single_file.command', ['kitty','-e','ranger','--choosefile={}'])
-config.set('fileselect.multiple_files.command', ['kitty','-e','ranger','--choosefiles={}'])
-config.set('fileselect.folder.command', ['kitty','-e','ranger','--choosedir={}'])
+config.set('fileselect.single_file.command', ['kitty','--class','filechoose_yazi','-e','yazi','--chooser-file={}'])
+config.set('fileselect.multiple_files.command', ['kitty','--class','filechoose_yazi','-e','yazi','--chooser-file={}'])
+config.set('fileselect.folder.command', ['kitty','--class','--filechoose_yazi','-e','yazi','--chooser-file={}']) # needs fixing upstream to work
 
 # bindings from doom emacs
 config.bind('<Alt-x>', 'cmd-set-text :')
diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix
index 7d8a17a6..7e2ec255 100644
--- a/modules/user/hyprland/default.nix
+++ b/modules/user/hyprland/default.nix
@@ -278,6 +278,9 @@ in
           "size 80% 85%,class:^(scratch_yazi)$"
           "workspace special:scratch_yazi silent,class:^(scratch_yazi)$"
           "center,class:^(scratch_yazi)$"
+          "float,class:^(filechoose_yazi)$"
+          "size 80% 85%,class:^(filechoose_yazi)$"
+          "center,class:^(filechoose_yazi)$"
           "float,class:^(scratch_numbat)$"
           "size 80% 85%,class:^(scratch_numbat)$"
           "workspace special:scratch_numbat silent,class:^(scratch_numbat)$"