diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb
index bdce436969..bbb0623b16 100644
--- a/lib/reline/ansi.rb
+++ b/lib/reline/ansi.rb
@@ -35,7 +35,7 @@ def self.set_default_key_bindings(config)
     {
       # default bindings
       [27, 32] => :em_set_mark,             # M-<space>
-      [24, 24] => :em_exchange_mark,        # C-x C-x TODO also add Windows
+      [24, 24] => :em_exchange_mark,        # C-x C-x
     }.each_pair do |key, func|
       config.add_default_key_binding_by_keymap(:emacs, key, func)
     end
diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb
index bf729ea254..072fb1b6cd 100644
--- a/lib/reline/windows.rb
+++ b/lib/reline/windows.rb
@@ -38,6 +38,7 @@ def self.set_default_key_bindings(config)
 
     {
       [27, 32] => :em_set_mark,             # M-<space>
+      [24, 24] => :em_exchange_mark,        # C-x C-x
     }.each_pair do |key, func|
       config.add_default_key_binding_by_keymap(:emacs, key, func)
     end