diff --git a/keyboards/ergodox_ez/keymaps/hbarbosa-general/keymap.c b/keyboards/ergodox_ez/keymaps/hbarbosa-general/keymap.c
index 9fcecd558123..ce7c7e36f136 100644
--- a/keyboards/ergodox_ez/keymaps/hbarbosa-general/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/hbarbosa-general/keymap.c
@@ -33,15 +33,15 @@ enum planck_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* 0: Dvorak */
   [_DV] = LAYOUT_ergodox(
-                 KC_GRV,      KC_1,    KC_2,    KC_3,          KC_4,    KC_5, TG(_MV),
+                 TG(_MV),     KC_1,    KC_2,    KC_3,          KC_4,    KC_5, TG(_MV),
                  KC_BSPC,     KC_QUOT, KC_COMM, KC_DOT,        KC_P,    KC_Y, TG(_DV_CTRL),
                  KC_CAPSLOCK, KC_A,    KC_O,    LT(_MS_R, KC_E), KC_U,    KC_I,
                  KC_LSFT,     KC_SCLN, KC_Q,    KC_J,          KC_K,    KC_X, KC_ENTER,
-                 MO(_MV),     KC_RALT, KC_LALT, F(1),          LOWER ,
+                 RAISE,       KC_RALT, KC_LALT, F(1),          LOWER ,
 
-                         KC_DELT, ALT_T(KC_APP),
-                                        KC_HOME,
-                 CTL_T(KC_SPC), ALT_TAB, KC_END,
+                           KC_DELT, ALT_T(KC_APP),
+                                          KC_HOME,
+                 CTL_T(KC_ENTER), ALT_TAB, KC_END,
 
                  TG(_MV),    KC_6, KC_7, KC_8,          KC_9,  KC_0,  KC_BSLS,
                  TG(_DV_CTRL),    KC_F, KC_G, KC_C,          KC_R,  KC_L,  KC_BSPC,