diff --git a/Command/Status.hs b/Command/Status.hs
index 5b92537808..ff71e01209 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -68,8 +68,10 @@ start [] = do
 	globalStatus
 	stop
 start ps = do
-	mapM_ localStatus ps
+	mapM_ localStatus =<< filterM isdir ps
 	stop
+  where
+	isdir = liftIO . catchBoolIO . (isDirectory <$$> getFileStatus)
 
 globalStatus :: Annex ()
 globalStatus = do