diff --git a/devices/pc/default.nix b/devices/pc/default.nix
index a9048a22..0369268a 100644
--- a/devices/pc/default.nix
+++ b/devices/pc/default.nix
@@ -141,7 +141,7 @@ inputs:
         waydroid = {};
         docker = {};
       };
-      bugs = [ "xmunet" "backlight" "amdpstate" ];
+      bugs = [ "xmunet" "backlight" "amdpstate" "bluetooth" ];
     };
     boot =
     {
diff --git a/devices/surface/default.nix b/devices/surface/default.nix
index 534da119..23e1988d 100644
--- a/devices/surface/default.nix
+++ b/devices/surface/default.nix
@@ -54,7 +54,7 @@ inputs:
         waydroid = {};
         docker = {};
       };
-      bugs = [ "xmunet" "suspend-hibernate-no-platform" ];
+      bugs = [ "xmunet" "suspend-hibernate-no-platform" "bluetooth" ];
       packages.vasp = null;
     };
     powerManagement.resumeCommands = ''${inputs.pkgs.systemd}/bin/systemctl restart iptsd'';
diff --git a/modules/bugs/default.nix b/modules/bugs/default.nix
index dad4ed0b..f0f834ec 100644
--- a/modules/bugs/default.nix
+++ b/modules/bugs/default.nix
@@ -40,6 +40,9 @@ inputs:
       amdpstate.boot.kernelParams = [ "amd_pstate=active" ];
       hibernate-mt7921e.powerManagement.resumeCommands =
         let modprobe = "${inputs.pkgs.kmod}/bin/modprobe"; in "${modprobe} -r -w 3000 mt7921e && ${modprobe} mt7921e";
+      # could not use bt keyboard
+      # https://github.com/bluez/bluez/issues/745
+      bluetooth.hardware.bluetooth.settings.General.JustWorksRepairing = "always";
     };
   in
     {