diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 4ec03404816..fc3f48a37c5 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -84,8 +84,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LCPO_KEYS KC_LCTL, KC_TRNS, KC_LBRACKET
 #define RCPC_KEYS KC_RCTL, KC_TRNS, KC_ENTER
 
-#define LSPO_KEYS KC_LSHIFT, KC_TRNS, KC_SPACE
-#define RSPC_KEYS KC_RSHIFT, KC_TRNS, KC_BSPACE
+// #define LSPO_KEYS KC_LSHIFT, KC_TRNS, KC_SPACE
+// #define RSPC_KEYS KC_RSHIFT, KC_TRNS, KC_BSPACE
 
 #undef PRODUCT
 #define PRODUCT Corne Keyboard
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index 84d61fb9eea..0152679ffc6 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -41,6 +41,9 @@ enum custom_keycodes {
 #define KC_TBFWD LCTL(KC_TAB)
 #define KC_TBBCK LCTL(LSFT(KC_TAB))
 
+#define KC_SFSPC LSFT_T(KC_SPACE)
+#define KC_SFBSP RSFT_T(KC_BSPACE)
+
 #define KC_EUR ALGR(KC_5)
 
 #define KC______ KC_TRNS
@@ -72,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
        LCPO,     Z,     X,     C,     D,     V,                      K,     H,  COMM,   DOT,  SLSH,  RCPC,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                   LALT, T_SYM,  LSPO,     RSPC, T_NAV,  RGUI \
+                                   LALT, T_SYM, SFSPC,    SFBSP, T_NAV,  RGUI \
                               //`--------------------'  `--------------------'
   ),