diff --git a/layers/+keyboard-layouts/bepo/keybindings.el b/layers/+keyboard-layouts/bepo/keybindings.el
index 9e3ca3bd5..15414ac27 100644
--- a/layers/+keyboard-layouts/bepo/keybindings.el
+++ b/layers/+keyboard-layouts/bepo/keybindings.el
@@ -234,6 +234,8 @@
     (bepo/set-in-state helm-generic-files-map "C-s" 'helm-previous-line)
     (bepo/set-in-state helm-generic-files-map "C-k" 'helm-ff-run-grep)))
 
+;; HACK: Waiting to find the bug…
+(setq evil-magit-use-y-for-yank nil)
 (bepo|config magit
   :description
   "Remap `magit' bindings."