diff --git a/modules/optional/graphical/default.nix b/modules/optional/graphical/default.nix
index 7e56df9..230cec2 100644
--- a/modules/optional/graphical/default.nix
+++ b/modules/optional/graphical/default.nix
@@ -3,6 +3,7 @@
   inputs,
   lib,
   minimal,
+  pkgs,
   ...
 }: let
   inherit
@@ -32,6 +33,9 @@ in
     config = {
       # Needed for gtk
       programs.dconf.enable = true;
+      # Required for gnome3 pinentry
+      services.dbus.packages = [pkgs.gcr];
+
       stylix = {
         # I want to choose what to style myself.
         autoEnable = false;
diff --git a/users/myuser/gpg.nix b/users/myuser/gpg.nix
index 99b4ef3..3a5363f 100644
--- a/users/myuser/gpg.nix
+++ b/users/myuser/gpg.nix
@@ -58,6 +58,6 @@
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
-    pinentryFlavor = "qt";
+    pinentryFlavor = "gnome3";
   };
 }
diff --git a/users/myuser/graphical/default.nix b/users/myuser/graphical/default.nix
index 2709bff..91bc6a6 100644
--- a/users/myuser/graphical/default.nix
+++ b/users/myuser/graphical/default.nix
@@ -40,10 +40,11 @@
       zathura
     ];
 
+    # TODO yubikey pinentry is curses but should be graphical
+    # TODO test different pinentrys (pinentry gtk?)
     # TODO wrap thunderbird bin and set LC_ALL=de_DE.UTF-8 because thunderbird uses wrong date and time formatting with C.UTF-8
     # TODO make screenshot copy work even if notification fails (set -e does its thing here)
     # TODO pavucontrol shortcut or bar button
-    # TODO audible bell in qt pinentry drives me nuts
     # TODO secureboot -> use pam yubikey login
     # TODO keyboard stays lit on poweroff -> add systemd service to disable it on shutdown
     # TODO on neogit close do neotree update
@@ -56,9 +57,7 @@
     # TODO neovim reopening file should continue at the previous position
     # TODO thunderbird doesn't use passwords from password command
     # TODO rotating wallpaper
-    # TODO yubikey pinentry is curses but should be graphical
     # TODO accounts.concats accounts.calendar
-    # TODO test different pinentrys (pinentry gtk?)
     # TODO agenix rekey edit secret should create temp files with same extension
     # TODO mod+f1-4 for left monitor?
     # TODO autostart signal, firefox (both windows), etc.