diff --git a/ansible/inventory/group_vars/desktop.yml b/ansible/inventory/group_vars/desktop.yml
index 7225c3e..7e6c224 100644
--- a/ansible/inventory/group_vars/desktop.yml
+++ b/ansible/inventory/group_vars/desktop.yml
@@ -16,6 +16,8 @@ desktop_common_packages:
   - dunst
   - emptty
   - network-manager-applet
+  - pinentry-emacs
+  - pinentry-gtk
   - rofi
   - udiskie
   - xfce-polkit
diff --git a/dotfiles/desktop/.bashrc.d/10-gpg-tty.sh b/dotfiles/desktop/.bashrc.d/10-gpg-tty.sh
new file mode 100644
index 0000000..af914e4
--- /dev/null
+++ b/dotfiles/desktop/.bashrc.d/10-gpg-tty.sh
@@ -0,0 +1,4 @@
+if tty -s; then
+  export GPG_TTY="$(tty)"
+  gpg-connect-agent updatestartuptty /bye >/dev/null 2>&1
+fi
diff --git a/dotfiles/desktop/.gnupg/gpg-agent.conf b/dotfiles/desktop/.gnupg/gpg-agent.conf
index c41d6be..e003c69 100644
--- a/dotfiles/desktop/.gnupg/gpg-agent.conf
+++ b/dotfiles/desktop/.gnupg/gpg-agent.conf
@@ -1,3 +1,4 @@
+pinentry-program /usr/bin/pinentry-gtk-2
 enable-ssh-support
 default-cache-ttl 600
-max-cache-ttl 7200
\ No newline at end of file
+max-cache-ttl 7200