diff --git a/CHANGELOG b/CHANGELOG
index 13a00e5c32..0d2953328a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@ git-annex (10.20220725) UNRELEASED; urgency=medium
     concurrency is enabled.
   * stack.yaml: Updated to lts-19.16
   * Added new matching options --want-get-by and --want-drop-by.
+  * Allow find --branch to be used in a bare repository, the same as
+    the deprecated findref can be.
 
  -- Joey Hess <id@joeyh.name>  Mon, 25 Jul 2022 15:35:45 -0400
 
diff --git a/Command.hs b/Command.hs
index 07cded7fff..bc418fdc3d 100644
--- a/Command.hs
+++ b/Command.hs
@@ -122,7 +122,10 @@ repoExists :: CommandCheck
 repoExists = CommandCheck 0 ensureInitialized
 
 notBareRepo :: Command -> Command
-notBareRepo = addCheck $ whenM (fromRepo Git.repoIsLocalBare) $
+notBareRepo = addCheck checkNotBareRepo
+
+checkNotBareRepo :: Annex ()
+checkNotBareRepo = whenM (fromRepo Git.repoIsLocalBare) $
 	giveup "You cannot run this command in a bare repository."
 
 noDaemonRunning :: Command -> Command
diff --git a/Command/Find.hs b/Command/Find.hs
index 6b4051dc99..87758d5c74 100644
--- a/Command/Find.hs
+++ b/Command/Find.hs
@@ -21,7 +21,7 @@ import qualified Utility.Format
 import Utility.DataUnits
 
 cmd :: Command
-cmd = notBareRepo $ withAnnexOptions [annexedMatchingOptions] $ mkCommand $
+cmd = withAnnexOptions [annexedMatchingOptions] $ mkCommand $
 	command "find" SectionQuery "lists available files"
 		paramPaths (seek <$$> optParser)
 
@@ -55,6 +55,8 @@ parseFormatOption =
 
 seek :: FindOptions -> CommandSeek
 seek o = do
+	unless (isJust (keyOptions o)) $
+		checkNotBareRepo
 	islimited <- limited
 	let seeker = AnnexedFileSeeker
 		{ startAction = start o