diff --git a/beetsplug/fish.py b/beetsplug/fish.py
index b1518f1c4..82e035eb4 100644
--- a/beetsplug/fish.py
+++ b/beetsplug/fish.py
@@ -183,16 +183,16 @@ def get_basic_beet_options():
         BL_NEED2.format("-l format-item", "-f -d 'print with custom format'")
         + BL_NEED2.format("-l format-album", "-f -d 'print with custom format'")
         + BL_NEED2.format(
-            "-s  l  -l library", "-f -r -d 'library database file to use'"
+            "-s  l  -l library", "-F -r -d 'library database file to use'"
         )
         + BL_NEED2.format(
-            "-s  d  -l directory", "-f -r -d 'destination music directory'"
+            "-s  d  -l directory", "-F -r -d 'destination music directory'"
         )
         + BL_NEED2.format(
             "-s  v  -l verbose", "-f -d 'print debugging information'"
         )
         + BL_NEED2.format(
-            "-s  c  -l config", "-f -r -d 'path to configuration file'"
+            "-s  c  -l config", "-F -r -d 'path to configuration file'"
         )
         + BL_NEED2.format(
             "-s  h  -l help", "-f -d 'print this help message and exit'"
@@ -216,7 +216,7 @@ def get_subcommands(cmd_name_and_help, nobasicfields, extravalues):
             word += BL_USE3.format(
                 cmdname,
                 f"-a {wrap('$FIELDS')}",
-                f"-f -d {wrap('fieldname')}",
+                f"-d {wrap('fieldname')}",
             )
 
         if extravalues:
@@ -270,7 +270,7 @@ def get_all_commands(beetcmds):
                 word += " ".join(
                     BL_USE3.format(
                         name,
-                        f"{cmd_need_arg}{cmd_s}{cmd_l} -f {cmd_arglist}",
+                        f"{cmd_need_arg}{cmd_s}{cmd_l} {cmd_arglist}",
                         cmd_helpstr,
                     ).split()
                 )
@@ -278,7 +278,7 @@ def get_all_commands(beetcmds):
 
             word = word + BL_USE3.format(
                 name,
-                "-s h -l help -f",
+                "-s h -l help",
                 f"-d {wrap('print help')}",
             )
     return word
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c87f1eaf4..d59c7ba1f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -50,6 +50,8 @@ New features:
   the ``clearart_on_import`` config option. Also, ``beet clearart`` is only
   going to update the files matching the query and with an embedded art, leaving
   untouched the files without.
+- :doc:`plugins/fish`: Filenames are now completed in more places, like after
+  ``beet import``.
 
 Bug fixes: