diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix
index 4d07f98..223d378 100644
--- a/hosts/nixos/thinkpad/system.nix
+++ b/hosts/nixos/thinkpad/system.nix
@@ -276,6 +276,8 @@
           main = {
             # Map Caps Lock to Left Control
             capslock = "leftcontrol";
+            # Map Right Control to Caps Lock
+            rightcontrol = "capslock";
           };
         };
       };
diff --git a/modules/papis.nix b/modules/papis.nix
index 0795fa6..7fa32b4 100644
--- a/modules/papis.nix
+++ b/modules/papis.nix
@@ -2,7 +2,11 @@
 
 {
   # Install papis package
-  home.packages = [ pkgs.papis ];
+  home.packages = [
+    (pkgs.papis.overridePythonAttrs (old: {
+      doCheck = false;  # Skip tests due to Click incompatibility with Python 3.13
+    }))
+  ];
   # Papis configuration
   home.file.".config/papis/config".text = ''
     [settings]