diff --git a/.emacs.d/lisp/init-exwm.el b/.emacs.d/lisp/init-exwm.el
index 43cd9b90..dfbc592a 100644
--- a/.emacs.d/lisp/init-exwm.el
+++ b/.emacs.d/lisp/init-exwm.el
@@ -161,10 +161,16 @@
 
 (when (require 'desktop-environment nil 'noerror)
   (setq desktop-environment-screenshot-directory "~/temp")
-  ;; Use s-l to navigate windows.
   (define-key desktop-environment-mode-map (kbd "s-z") #'desktop-environment-lock-screen)
-  (desktop-environment-mode)
-  (exwm-input-set-key (kbd "s-l") #'windmove-right))
+  ;; Use s-l to navigate windows.
+  ;; REVIEW: This is a workaround because of
+  ;; https://gitlab.petton.fr/DamienCassou/desktop-environment/issues/3
+  (setq desktop-environment--keybindings
+        (delete
+         `(,(kbd "s-l") . ,(function desktop-environment-lock-screen))
+         desktop-environment--keybindings))
+  (define-key desktop-environment-mode-map (kbd "s-l") nil)
+  (desktop-environment-mode))
 
 ;;; Volume control
 (when (require 'pulseaudio-control nil t)