diff --git a/users/malte/modules/hypr.nix b/users/malte/modules/hypr.nix
index 58e9b03..44691bc 100644
--- a/users/malte/modules/hypr.nix
+++ b/users/malte/modules/hypr.nix
@@ -249,12 +249,12 @@
     };
 
     windowrule = [
-      # Pinentry fancyness
-      "float,class:^(pinentry-qt)$"
-      "pin,class:^(pinentry-qt)$"
-      "bordercolor rgb(ff0000) rgb(ff0000),class:^(pinentry-qt)$"
-      "center,class:^(pinentry-qt)$"
-      "animation popin,class:^(pinentry-qt)$"
+      # Pinentry fancyness, show floating on all screens
+      "float,class:^(pinentry-)"
+      "pin,class:^(pinentry-)"
+      "bordercolor rgb(ff0000) rgb(ff0000),class:^(pinentry-)"
+      "center,class:^(pinentry-)"
+      "animation popin,class:^(pinentry-)"
       "bordercolor rgb(ff0000),xwayland:1"
       # Yikes, firefox sharing indicator!
       "float,title:^(Firefox — Sharing Indicator)$"
@@ -266,9 +266,12 @@
     ];
 
     windowrulev2 = [
+      # Prevent pinentry from losing focus
+      "stayfocused,class:^(pinentry-)"
       # Float picture-in-picture videos
       "float,title:^(Picture-in-Picture)$,class:^(firefox)$"
       "pin,title:^(Picture-in-Picture)$,class:^(firefox)$"
+      "suppressevent fullscreen maximize,title:^(Picture-in-Picture)$,class:^(firefox)$"
       # Fix various steam windows
       "workspace 7,class:^(Steam)$"
       "float,title:^(Friends List)$,class:^(Steam)$"