diff --git a/community/webdad/desktop-overlay/etc/xdg/autostart/keyboard.desktop b/community/webdad/desktop-overlay/etc/xdg/autostart/keyboard.desktop
new file mode 100644
index 00000000..85491404
--- /dev/null
+++ b/community/webdad/desktop-overlay/etc/xdg/autostart/keyboard.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=setxkbmap
+Comment=setxkbmap
+Exec=/bin/setKeyboard.sh
+StartupNotify=false
+Terminal=false
+Type=Application
diff --git a/community/webdad/desktop-overlay/usr/bin/setKeyboard.sh b/community/webdad/desktop-overlay/usr/bin/setKeyboard.sh
new file mode 100755
index 00000000..02709bdb
--- /dev/null
+++ b/community/webdad/desktop-overlay/usr/bin/setKeyboard.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+layout="$(localectl status | grep Layout | cut -d ':' -f 2)"
+setxkbmap $layout