diff --git a/etc/X11/xorg.conf.d/00-keyboard.conf b/etc/X11/xorg.conf.d/00-keyboard.conf
index fba2a381..5b5efe45 100644
--- a/etc/X11/xorg.conf.d/00-keyboard.conf
+++ b/etc/X11/xorg.conf.d/00-keyboard.conf
@@ -4,5 +4,5 @@ Section "InputClass"
         Identifier "system-keyboard"
         MatchIsKeyboard "on"
         Option "XkbLayout" "fi"
-        Option "XkbModel" "compose:lwin"
+        Option "XkbModel" "compose:menu"
 EndSection
diff --git a/etc/profile.d/mikaela.sh b/etc/profile.d/mikaela.sh
index f8853e5f..972b5713 100644
--- a/etc/profile.d/mikaela.sh
+++ b/etc/profile.d/mikaela.sh
@@ -1,6 +1,6 @@
-# Map compose to left Windows key and kill x with ctrl alt backspace and
+# Map compose to left menu and kill x with ctrl alt backspace and
 # disable unbreakable space
-setxkbmap -option compose:lwin -option terminate:ctrl_alt_bksp -option nbsp:none
+setxkbmap -option compose:menu -option terminate:ctrl_alt_bksp -option nbsp:none
 
 # Set TZ as the current timezone. This is supposed to be sent over SSH.
 TZ=$(date +%Z)
diff --git a/rc/profile b/rc/profile
index 9a0efb5e..12a51f25 100644
--- a/rc/profile
+++ b/rc/profile
@@ -6,9 +6,9 @@ if hash ruby 2>/dev/null; then
     PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
 fi
 
-# Set compose to left Super/Windows, kill X with ctrl-alt-backspace,
+# Set compose to menu, kill X with ctrl-alt-backspace,
 # disable nbsp (still available with compose-space-space.
-setxkbmap -option compose:lwin -option terminate:ctrl_alt_bksp -option nbsp:none
+setxkbmap -option compose:menu -option terminate:ctrl_alt_bksp -option nbsp:none
 
 # Removes duplicates from $PATH. Copied from http://unix.stackexchange.com/a/14896
 PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')