diff --git a/hosts/common/programs/sane-input-handler/sane-input-handler b/hosts/common/programs/sane-input-handler/sane-input-handler
index 8d1d656e6..640720319 100755
--- a/hosts/common/programs/sane-input-handler/sane-input-handler
+++ b/hosts/common/programs/sane-input-handler/sane-input-handler
@@ -166,8 +166,14 @@ toggleKeyboard() {
     return
   fi
 
-  # `env` so that we get the right `kill` binary instead of bash's builtin
-  env kill -s RTMIN+0 "$keyboardPid"
+  for p in $keyboardPid; do
+    # `env` so that we get the right `kill` binary instead of bash's builtin
+    # `kill` only one keyboard process. in the case of e.g. sandboxing,
+    # the keyboard might consist of multiple processes and each one we signal would cause a toggle
+    if env kill -s RTMIN+0 "$p"; then
+      break
+    fi
+  done
 }
 
 ## DISPATCHERS
diff --git a/hosts/common/programs/wvkbd.nix b/hosts/common/programs/wvkbd.nix
index 2dbd4b9e4..9cf047f6b 100644
--- a/hosts/common/programs/wvkbd.nix
+++ b/hosts/common/programs/wvkbd.nix
@@ -8,7 +8,7 @@
       '';
     });
 
-    sandbox.method = "bwrap";
+    sandbox.method = "bunpen";
     sandbox.whitelistWayland = true;
 
     env.KEYBOARD = "wvkbd-mobintl";