diff --git a/magit.el b/magit.el
index 20594614..8daafef0 100644
--- a/magit.el
+++ b/magit.el
@@ -3261,6 +3261,7 @@ typing and automatically refreshes the status buffer."
     (define-key map (kbd "M-n") 'log-edit-next-comment)
     (define-key map (kbd "C-c C-k") 'magit-log-edit-cancel-log-message)
     (define-key map (kbd "C-c C-]") 'magit-log-edit-cancel-log-message)
+    (define-key map (kbd "C-x C-s") 'ignore)
     map))
 
 (defvar magit-pre-log-edit-window-configuration nil)