diff --git a/TODO.md b/TODO.md
index 00855ac9..5755c0f3 100644
--- a/TODO.md
+++ b/TODO.md
@@ -35,10 +35,6 @@
 
 - [] jump to alt buffer
 
-- [ ] load toml configs, themes, tabsize/identation
-
-- [ ] draw separator line between views
-
 - [ ] lsp: signature help
 - [x] lsp: hover
 - [ ] lsp: document symbols (nested/vec)
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 98e8b20c..b6ae0138 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1898,6 +1898,8 @@ pub fn space_mode(cx: &mut Context) {
                     cx.editor.close(cx.view_id);
                 }
                 // ' ' => toggle_alternate_buffer(cx),
+                // TODO: temporary since space mode took it's old key
+                ' ' => keep_primary_selection(cx),
                 _ => (),
             }
         }
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index e20c8ebf..26b2b5fe 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -220,6 +220,7 @@ pub fn default() -> Keymaps {
         shift!('K') => commands::keep_selections,
         // TODO: and another method for inverse
 
+        // TODO: clashes with space mode
         key!(' ') => commands::keep_primary_selection,
 
         // key!('q') => commands::record_macro,