diff --git a/etc/xmonad.hs b/etc/xmonad.hs
index d806e93..c2e57bf 100644
--- a/etc/xmonad.hs
+++ b/etc/xmonad.hs
@@ -35,6 +35,7 @@ windowManage = composeAll
   , role      =? "toolbox_window"        --> doF W.focusDown
 
   , className =? "Dunst"                 --> doF W.focusDown <+> doF copyToAll
+  , className =? "Pinentry"              --> doFloat <+> doF copyToAll
   ]
  where
    viewShift = doF . liftM2 (.) W.greedyView W.shift
diff --git a/home-manager.nix b/home-manager.nix
index dabb0de..5135fe0 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -85,9 +85,6 @@ in {
     services = {
       gpg-agent = {
         enable = true;
-        extraConfig = ''
-          pinentry-program ${pkgs.pinentry}/bin/pinentry-curses
-        '';
       };
     };
 
diff --git a/packages.nix b/packages.nix
index f623aa9..a07c7f4 100644
--- a/packages.nix
+++ b/packages.nix
@@ -55,7 +55,7 @@ in {
     # utils
     wget tmux zsh vim htop acpi bc p7zip mpv
     git pass unzip zip w3m whois dnsutils feh
-    parted iotop nmap tldr sshfs pinentry_ncurses
+    parted iotop nmap tldr sshfs
     oathToolkit neomutt pciutils easyrsa openvpn
     lsof tcpdump ddcutil pmount woeusb tigervnc
     file mkpasswd irssi heroku hdparm debootstrap