diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index 91a94fe9..e0326fc9 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -113,6 +113,9 @@
 (with-eval-after-load 'helm
   (define-key evil-motion-state-map "'" 'helm-all-mark-rings)
   (global-set-key (kbd "M-y") 'helm-show-kill-ring)
+  ;; Since Helm 3.6.* M-SPC is bound to helm-toggle-visible-mark-backward by default.
+  (define-key helm-map (kbd "M-SPC") 'helm-toggle-visible-mark)
+  (define-key helm-map (kbd "M-S-SPC") 'helm-toggle-visible-mark-backward)
   (dolist (map (list helm-find-files-map helm-read-file-map))
     (ambrevar/define-keys map
                           "M-." 'helm-end-of-buffer