diff --git a/xsession/.xmodmaprc b/xsession/.xmodmaprc
index 9eab4fc..b3ac8a5 100644
--- a/xsession/.xmodmaprc
+++ b/xsession/.xmodmaprc
@@ -1,5 +1,6 @@
 ! make right windows key and menu key a hyper key
 remove mod4 = Super_R
+keycode 133 = Escape NoSymbol Escape
 keycode 134 = Hyper_R NoSymbol Hyper_R
 keycode 135 = Hyper_R NoSymbol Hyper_R
 add mod3 = Hyper_R
diff --git a/xsession/.xsession b/xsession/.xsession
index 68b7c91..456fd11 100755
--- a/xsession/.xsession
+++ b/xsession/.xsession
@@ -8,7 +8,7 @@ xset b off
 xrandr --auto
 xrandr --output HDMI1 --right-of DP1
 xrdb -merge ~/.Xresources
-setxkbmap pl -option caps:escape
+setxkbmap pl -option ctrl:nocaps
 xmodmap ~/.xmodmaprc
 
 if [ -x  ~/.fehbg ]; then