diff --git a/kitty/fast-file-copy.c b/kitty/fast-file-copy.c
index dec635286..8c3e032df 100644
--- a/kitty/fast-file-copy.c
+++ b/kitty/fast-file-copy.c
@@ -60,9 +60,12 @@ copy_with_sendfile(int infd, int outfd, off_t in_pos, size_t len, FastFileCopyBu
         off_t r = in_pos;
         ssize_t n = sendfile(outfd, infd, &r, len);
         if (n < 0) {
-            if (errno != EAGAIN) return false;
-            if (errno == ENOSYS || errno == EPERM) return copy_with_buffer(infd, outfd, in_pos, len, fcb);
-            continue;
+            if (errno == EAGAIN) continue;
+            if (errno == ENOSYS || // No kernel support
+                errno == EPERM  ||
+                errno == EINVAL)   // ZFS for some reason
+                return copy_with_buffer(infd, outfd, in_pos, len, fcb);
+            return false;
         }
         if (n == 0) {
             // happens if input file is truncated
@@ -83,9 +86,15 @@ copy_with_file_range(int infd, int outfd, off_t in_pos, size_t len, FastFileCopy
         off64_t r = in_pos;
         ssize_t n = copy_file_range(infd, &r, outfd, NULL, len, 0);
         if (n < 0) {
-            if (errno != EAGAIN) return false;
-            if (errno == ENOSYS || errno == EPERM) return copy_with_sendfile(infd, outfd, in_pos, len, fcb);
-            continue;
+            if (errno == EAGAIN) continue;
+            if (errno == ENOSYS     || // Linux < 4.5
+                errno == EPERM      || // Possibly Docker
+                errno == EINVAL     || // ZFS for some reason
+                errno == EIO        || // CIFS
+                errno == EOPNOTSUPP || // NFS
+                errno == EXDEV)        // Prior to Linux 5.3, it was not possible to copy_file_range across file systems
+                return copy_with_sendfile(infd, outfd, in_pos, len, fcb);
+            return false;
         }
         if (n == 0) {
             // happens if input file is truncated