diff --git a/server/internal/remote/manager.go b/server/internal/remote/manager.go
index 4268a65e..20fd34db 100644
--- a/server/internal/remote/manager.go
+++ b/server/internal/remote/manager.go
@@ -249,7 +249,7 @@ func (manager *RemoteManager) SetKeyboardLayout(layout string) {
 	// When pressing `shift` + `,` instead of `<` comes `>`.
 	variant := ""
 	if layout == "us" {
-		variant = "intl"
+		variant = "mac" // TODO: Test all keys.
 	}
 
 	exec.Command("setxkbmap", layout, variant).Run()