diff --git a/isync/.mbsyncrc b/isync/.mbsyncrc
index d59fb5d..8a1a13f 100644
--- a/isync/.mbsyncrc
+++ b/isync/.mbsyncrc
@@ -1,7 +1,7 @@
 IMAPAccount gmail
     Host imap.gmail.com
     User jeremydkaplan@gmail.com
-    PassCmd "pass email/jeremydkaplan@gmail.com"
+    PassCmd "gopass show personal/email/jeremydkaplan@gmail.com | head -n 1"
     SSLType IMAPS
     CertificateFile /etc/ssl/certs/ca-certificates.crt
 
@@ -24,7 +24,7 @@ Channel gmail
 IMAPAccount mit
     Host imap.exchange.mit.edu
     User jdkaplan
-    PassCmd "pass email/jdkaplan@mit.edu"
+    PassCmd "gopass show personal/email/jdkaplan@mit.edu | head -n 1"
     SSLType IMAPS
     CertificateFile /etc/ssl/certs/ca-certificates.crt
 
@@ -47,7 +47,7 @@ Channel mit
 IMAPAccount metagram
     Host metagram.net
     User jdkaplan@metagram.net
-    PassCmd "pass email/jdkaplan@metagram.net"
+    PassCmd "gopass show personal/email/jdkaplan@metagram.net | head -n 1"
     SSLType IMAPS
     CertificateFile /etc/ssl/certs/ca-certificates.crt
 
diff --git a/mutt/gmail b/mutt/gmail
index 9144db7..ab4f7b6 100644
--- a/mutt/gmail
+++ b/mutt/gmail
@@ -1,7 +1,7 @@
 source ~/.mutt/common
 
 set my_username = "jeremydkaplan"
-set my_password = "`pass show email/jeremydkaplan@gmail.com`"
+set my_password = "`gopass show personal/email/jeremydkaplan@gmail.com | head -n 1`"
 
 set smtp_pass = $my_password
 
diff --git a/mutt/metagram b/mutt/metagram
index 9b39ad6..56da868 100644
--- a/mutt/metagram
+++ b/mutt/metagram
@@ -1,7 +1,7 @@
 source ~/.mutt/common
 
 set my_email = "jdkaplan@metagram.net"
-set my_password = "`pass show email/jdkaplan@metagram.net`"
+set my_password = "`gopass show personal/email/jdkaplan@metagram.net | head -n 1`"
 
 set smtp_pass = $my_password
 
diff --git a/mutt/mit b/mutt/mit
index 8a28c72..714b63c 100644
--- a/mutt/mit
+++ b/mutt/mit
@@ -1,7 +1,7 @@
 source ~/.mutt/common
 
 set my_username = "jdkaplan"
-set my_password = "`pass show email/jdkaplan@mit.edu`"
+set my_password = "`gopass show personal/email/jdkaplan@mit.edu | head -n 1`"
 
 set smtp_pass = $my_password
 
diff --git a/pianobar/config b/pianobar/config
index e833319..18042ab 100644
--- a/pianobar/config
+++ b/pianobar/config
@@ -1,2 +1,2 @@
 user = 'jeremydkaplan@gmail.com'
-password_command = gopass show shared/pandora.com | head -n 1
+password_command = gopass show personal/pandora.com | head -n 1
diff --git a/tako/completers/passget.tako b/tako/completers/passget.tako
index be735cc..14c7e71 100644
--- a/tako/completers/passget.tako
+++ b/tako/completers/passget.tako
@@ -1,31 +1,7 @@
 from os.path import isdir, join
 
-ROOT = ${...}.get('PASSWORD_STORE_DIR', $HOME + '/.password-store')
-SUFFIX = '.gpg'
-
-def make_display(directory):
-    def display(completion):
-        if isdir(join(ROOT, directory, completion)):
-            return completion + '/'
-        if completion.endswith(SUFFIX):
-            return join(directory, completion[:-len(SUFFIX)])
-        return completion
-    return display
-
 def passget_completer(prefix, line, begidx, endidx, ctx):
-    if not line.startswith('passget'): return {}
-
-    directory = ''
-
-    if '/' in prefix:
-        pre_dir, pre = prefix.rsplit('/', 1)
-        if isdir(join(ROOT, directory, pre_dir)):
-            directory = join(directory, pre_dir)
-            prefix = pre
-
-    completions = $(ls @(join(ROOT, directory))).splitlines()
-
-    display = make_display(directory)
-    return {display(i) for i in completions if i.startswith(prefix)}
+    if not line.startswith('passget'): return set()
+    return {secret for secret in !(gopass ls --flat) if secret.startswith(prefix)}
 
 completer add passget passget_completer