diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c
index 6b7d290bde..1eeee7e82b 100644
--- a/users/talljoe/talljoe.c
+++ b/users/talljoe/talljoe.c
@@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
       KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_ESC,
       KC_TAB , KC_Q,    KC_W,    KC_E,    KC_R,    KC_T   , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,
-      US_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G   , KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, US_QUOT,          KC_ENT ,
+      US_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G   , KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, US_QUOT,          US_ENT ,
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B   , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO_ADJ ,
       KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC2, KC_SPC1, KC_SPC3,                   KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
   [_WORKMAN] = LAYOUT(
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, XXXXXXX, KC_DEL ,
       US_CAPS, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_PPLS, KC_PENT,          XXXXXXX,
       KC_LSFT, KC_EQL,  KC_PLUS, KC_BSLS, KC_PIPE, XXXXXXX, XXXXXXX, KC_1,    KC_2,    KC_3,    KC_PAST,          KC_PSLS, XXXXXXX,
-      KC_LCTL, KC_LGUI, KC_LALT,                   XXXXXXX, KC_BSPC, KC_0,                      KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ),
+      KC_LCTL, KC_LGUI, KC_LALT,                   NM_SPC2, NM_SPC1, NM_SPC3,                   KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ),
  // Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
   [_ADJUST] = LAYOUT(
       MO_RST , FX(1)  , FX(2)  , FX(3)  , FX(4)  , FX(5)  , FX(6)  , FX(7)  , FX(8)  , FX(9)  , FX(10) , BR_DEC , BR_INC , XXXXXXX, MO_RST ,
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       MO_RST , AG_NORM, AG_SWAP,                   XXXXXXX, BL_TOGG, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS),
   // To Reset hit FN + ` + Esc
   [_RESET] = LAYOUT(
-      RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  ,
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
diff --git a/users/talljoe/talljoe.h b/users/talljoe/talljoe.h
index 4a4b925447..ec754a2aa5 100644
--- a/users/talljoe/talljoe.h
+++ b/users/talljoe/talljoe.h
@@ -49,6 +49,7 @@ enum layers {
 #define US_CAPS   CTL_T(KC_ESC)
 #define US_QUOT   MT(MOD_RCTL, KC_QUOT)
 #define US_MINS   MT(MOD_RCTL, KC_QUOT)
+#define US_ENT    LT(_NUM, KC_ENT)
 
 #ifndef SPACE_COUNT
   #define SPACE_COUNT 1
@@ -56,17 +57,23 @@ enum layers {
 #if (SPACE_COUNT == 1)
   #define KC_SPC1   LT(_NAV, KC_SPC)
   #define NV_SPC1   _______
+  #define NM_SPC1   _______
   #define KC_SPC2   XXXXXXX
   #define NV_SPC2   _______
+  #define NM_SPC2   _______
   #define KC_SPC3   XXXXXXX
   #define NV_SPC3   _______
+  #define NM_SPC3   _______
 #elif (SPACE_COUNT == 3)
-  #define KC_SPC1   KC_SPC
-  #define NV_SPC1   KC_BSPC
+  #define KC_SPC1   KC_BSPC
+  #define NV_SPC1   KC_SPC
+  #define NM_SPC1   KC_SPC
   #define KC_SPC2   LT(_NUM,KC_ENT)
   #define NV_SPC2   MT(MOD_LSFT | MOD_LCTL, KC_ENT)
+  #define NM_SPC2   XXXXXXX
   #define KC_SPC3   LT(_NAV,KC_SPC)
   #define NV_SPC3   KC_SPC
+  #define NM_SPC3   KC_0
 #else
   #error "Unsupported space count:" SPACE_COUNT
 #endif