diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 5378a29d..0a600ab7 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -89,9 +89,6 @@ rec {
 
       autostart = {
         immediate = [
-          # "dbus-update-activation-environment DISPLAY"
-          # "dbus-update-activation-environment WAYLAND_DISPLAY"
-          # "dbus-update-activation-environment XDG_CURRENT_DESKTOP"
         ];
 
         delayed = [
diff --git a/home/modules/hyprland/default.nix b/home/modules/hyprland/default.nix
index 41fafd28..6e8f7ee2 100644
--- a/home/modules/hyprland/default.nix
+++ b/home/modules/hyprland/default.nix
@@ -118,6 +118,9 @@
     "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
     "hyprctl setcursor Bibata-Modern-Classic 16"
 
+    # NOTE: Hack because Hyprland doesn't set the xwayland/x11 keymap correctly
+    "setxkbmap -layout ${hyprland.kb-layout} -variant ${hyprland.kb-variant} -model pc104"
+
     # Provide a polkit authentication UI.
     # This is used for example when running systemd commands without root.
     "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"