diff --git a/cli/onionshare_cli/web/send_base_mode.py b/cli/onionshare_cli/web/send_base_mode.py
index 234f1f41..d7173cab 100644
--- a/cli/onionshare_cli/web/send_base_mode.py
+++ b/cli/onionshare_cli/web/send_base_mode.py
@@ -246,7 +246,7 @@ class SendBaseModeWeb:
                             or self.common.platform == "BSD"
                         ):
                             if self.web.settings.get("share", "log_filenames"):
-                                filename_str = "{0} - ".format(os.path.basename(file_to_download))
+                                filename_str = "f{path} - "
                             else:
                                 filename_str = ""
                             
diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py
index a7d43cbf..276a7be8 100644
--- a/cli/onionshare_cli/web/share_mode.py
+++ b/cli/onionshare_cli/web/share_mode.py
@@ -346,8 +346,14 @@ class ShareModeWeb(SendBaseModeWeb):
                         or self.common.platform == "Linux"
                         or self.common.platform == "BSD"
                     ):
+                        if self.web.settings.get("share", "log_filenames"):
+                            filename_str = f"{path} - "
+                        else:
+                            filename_str = ""
+
                         sys.stdout.write(
-                            "\r{0:s}, {1:.2f}%          ".format(
+                            "\r{0}{1:s}, {2:.2f}%          ".format(
+                                filename_str,
                                 self.common.human_readable_filesize(downloaded_bytes),
                                 percent,
                             )