diff --git a/modules/completion/selectrum/TODO.org b/modules/completion/selectrum/TODO.org
index c72a42b46..d77362a4e 100644
--- a/modules/completion/selectrum/TODO.org
+++ b/modules/completion/selectrum/TODO.org
@@ -8,6 +8,10 @@ preview deactivated for now (see consult use-package)
 ** TODO =SPC s s= and =SPC s S= ~:sw~
 There isn't really a selectrum analogue to ~swiper-isearch~, ~consult-isearch~
 does something else (give you previously used isearch search terms).
+** TODO fix C-SPC
+currently after executing the action it:
+- moves the cursor to the new window if created, might not be desired in all cases
+- for some reason opens buffers in a new window (might be upstream bug?)
 * PROJ List of things needed for Ivy parity
 ** TODO Icons
 https://github.com/minad/marginalia/issues/59
diff --git a/modules/completion/selectrum/config.el b/modules/completion/selectrum/config.el
index 85057034a..a6f28bd85 100644
--- a/modules/completion/selectrum/config.el
+++ b/modules/completion/selectrum/config.el
@@ -99,7 +99,10 @@
         (lambda (map)
           (which-key--show-keymap "Embark" map nil nil 'no-paging)
           #'which-key--hide-popup-ignore-command)
-        embark-become-indicator embark-action-indicator))
+        embark-become-indicator embark-action-indicator)
+  :config
+  (let ((embark-quit-after-action nil))
+    (map! :map minibuffer-local-map "C-SPC" #'embark-default-action)))
 
 (use-package! marginalia
   :hook (doom-first-input . marginalia-mode)