diff --git a/command-signatures/json/pass.json b/command-signatures/json/pass.json
index 5e1bc4d0..43bf5b61 100644
--- a/command-signatures/json/pass.json
+++ b/command-signatures/json/pass.json
@@ -4,10 +4,7 @@
     "args": {
         "name": "pass-name",
         "description": "The password you want to show",
-        "generators": {
-            "script": "function(){return\"grep -r -l '' $HOME/.password-store --exclude-dir=.git\"}",
-            "postProcess": "_NuFrRa_s=>s.split(`\n`).map(o=>({name:o.split(\".password-store/\").pop().replace(\".gpg\",\"\"),icon:\"\\u{1F510}\"}))"
-        }
+        "generatorName": "entries"
     },
     "options": [
         {
@@ -102,10 +99,7 @@
                 {
                     "name": "old-path",
                     "description": "The old password name or directory",
-                    "generators": {
-                        "script": "function(){return\"grep -r -l '' $HOME/.password-store --exclude-dir=.git\"}",
-                        "postProcess": "_NuFrRa_s=>s.split(`\n`).map(o=>({name:o.split(\".password-store/\").pop().replace(\".gpg\",\"\"),icon:\"\\u{1F510}\"}))"
-                    }
+                    "generatorName": "entries"
                 },
                 {
                     "name": "new-path",
@@ -129,10 +123,7 @@
                 {
                     "name": "old-path",
                     "description": "The old password name or directory",
-                    "generators": {
-                        "script": "function(){return\"grep -r -l '' $HOME/.password-store --exclude-dir=.git\"}",
-                        "postProcess": "_NuFrRa_s=>s.split(`\n`).map(o=>({name:o.split(\".password-store/\").pop().replace(\".gpg\",\"\"),icon:\"\\u{1F510}\"}))"
-                    }
+                    "generatorName": "entries"
                 },
                 {
                     "name": "new-path",
@@ -155,10 +146,7 @@
             "args": {
                 "name": "pass-name",
                 "description": "The password name",
-                "generators": {
-                    "script": "function(){return\"grep -r -l '' $HOME/.password-store --exclude-dir=.git\"}",
-                    "postProcess": "_NuFrRa_s=>s.split(`\n`).map(o=>({name:o.split(\".password-store/\").pop().replace(\".gpg\",\"\"),icon:\"\\u{1F510}\"}))"
-                }
+                "generatorName": "entries"
             },
             "options": [
                 {
@@ -232,10 +220,7 @@
                 "name": "password sub-directory",
                 "description": "The password sub directory you want to list",
                 "isOptional": true,
-                "generators": {
-                    "script": "function(){return\"ls -dR1a $HOME/.password-store/*/\"}",
-                    "postProcess": "_NuFrRa_s=>s.split(`\n`).map(o=>({name:o.split(\".password-store/\").pop(),icon:\"\\u{1F4C1}\"}))"
-                }
+                "generatorName": "directories"
             }
         },
         {
@@ -252,10 +237,7 @@
             "args": {
                 "name": "pass-name",
                 "description": "The password you want to show",
-                "generators": {
-                    "script": "function(){return\"grep -r -l '' $HOME/.password-store --exclude-dir=.git\"}",
-                    "postProcess": "_NuFrRa_s=>s.split(`\n`).map(o=>({name:o.split(\".password-store/\").pop().replace(\".gpg\",\"\"),icon:\"\\u{1F510}\"}))"
-                }
+                "generatorName": "entries"
             },
             "options": [
                 {
@@ -280,10 +262,7 @@
             "args": {
                 "name": "pass-name",
                 "description": "The password you want to edit",
-                "generators": {
-                    "script": "function(){return\"grep -r -l '' $HOME/.password-store --exclude-dir=.git\"}",
-                    "postProcess": "_NuFrRa_s=>s.split(`\n`).map(o=>({name:o.split(\".password-store/\").pop().replace(\".gpg\",\"\"),icon:\"\\u{1F510}\"}))"
-                }
+                "generatorName": "entries"
             }
         },
         {
diff --git a/command-signatures/src/generators/mod.rs b/command-signatures/src/generators/mod.rs
index b6100244..5c1b9eb6 100644
--- a/command-signatures/src/generators/mod.rs
+++ b/command-signatures/src/generators/mod.rs
@@ -35,6 +35,7 @@ mod node;
 mod npm;
 mod nx;
 mod pacman;
+mod pass;
 mod phpunit_watcher;
 mod pip;
 mod powershell;
@@ -74,6 +75,7 @@ pub fn dynamic_command_signature_data() -> HashMap<String, DynamicCompletionData
         npm::yarn_generators(),
         nx::generator(),
         pacman::generator(),
+        pass::generator(),
         phpunit_watcher::generator(),
         pip::generator(),
         pip::pip3_generator(),
diff --git a/command-signatures/src/generators/pass.rs b/command-signatures/src/generators/pass.rs
new file mode 100644
index 00000000..12f02dd3
--- /dev/null
+++ b/command-signatures/src/generators/pass.rs
@@ -0,0 +1,40 @@
+use warp_completion_metadata::{
+    CommandBuilder, CommandSignatureGenerators, Generator, GeneratorResultsCollector, Suggestion,
+};
+
+pub fn generator() -> CommandSignatureGenerators {
+    // The shell commands cd into the password store directory so that `find`
+    // outputs paths relative to it.  sed then strips the leading `./` and,
+    // for entries, the trailing `.gpg` extension.
+    CommandSignatureGenerators::new("pass")
+        .add_generator(
+            "entries",
+            Generator::script(
+                CommandBuilder::single_command(
+                    "(cd \"${PASSWORD_STORE_DIR:-$HOME/.password-store}\" 2>/dev/null && find . -name '*.gpg' ! -path '*/.git/*' | sed 's|^\\./||;s|\\.gpg$||' | sort)",
+                ),
+                |output| {
+                    output
+                        .lines()
+                        .filter(|line| !line.is_empty())
+                        .map(|line| Suggestion::with_description(line.trim(), "Password entry"))
+                        .collect_unordered_results()
+                },
+            ),
+        )
+        .add_generator(
+            "directories",
+            Generator::script(
+                CommandBuilder::single_command(
+                    "(cd \"${PASSWORD_STORE_DIR:-$HOME/.password-store}\" 2>/dev/null && find . -type d ! -name '.git' ! -path '*/.git/*' -mindepth 1 | sed 's|^\\./||' | sort)",
+                ),
+                |output| {
+                    output
+                        .lines()
+                        .filter(|line| !line.is_empty())
+                        .map(|line| Suggestion::with_description(line.trim(), "Password directory"))
+                        .collect_unordered_results()
+                },
+            ),
+        )
+}