diff --git a/beetsplug/fish.py b/beetsplug/fish.py
index 9de764656..27b186a4c 100644
--- a/beetsplug/fish.py
+++ b/beetsplug/fish.py
@@ -25,7 +25,7 @@ by default but can be added via the `-e` / `--extravalues` flag. For example:
 import os
 from operator import attrgetter
 
-from beets import library, ui
+from beets import library, plugins, ui
 from beets.plugins import BeetsPlugin
 from beets.ui import commands
 
@@ -111,7 +111,7 @@ class FishPlugin(BeetsPlugin):
         nobasicfields = opts.noFields  # Do not complete for album/track fields
         extravalues = opts.extravalues  # e.g., Also complete artists names
         beetcmds = sorted(
-            (commands.default_commands + commands.plugins.commands()),
+            (commands.default_commands + plugins.commands()),
             key=attrgetter("name"),
         )
         fields = sorted(set(library.Album.all_keys() + library.Item.all_keys()))
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 323fdfcb1..8a7470932 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,9 +13,10 @@ Unreleased
     New features
     ~~~~~~~~~~~~
 
-..
-    Bug fixes
-    ~~~~~~~~~
+Bug fixes
+~~~~~~~~~
+
+- :doc:`plugins/fish`: Fix AttributeError. :bug:`6340`
 
 ..
     For plugin developers