diff --git a/moonlander/keymaps/sroccaserra/config.h b/moonlander/keymaps/sroccaserra/config.h
index 567037f..6f36174 100644
--- a/moonlander/keymaps/sroccaserra/config.h
+++ b/moonlander/keymaps/sroccaserra/config.h
@@ -11,3 +11,7 @@
 #define USB_SUSPEND_WAKEUP_DELAY 0
 #define FIRMWARE_VERSION u8"jXKZa/mDJvX"
 #define RGB_MATRIX_STARTUP_SPD 60
+
+#define COMBO_COUNT 2
+#define COMBO_TERM 40
+#define COMBO_PERMISSIVE_HOLD
diff --git a/moonlander/keymaps/sroccaserra/keymap.c b/moonlander/keymaps/sroccaserra/keymap.c
index dc22f10..e54baed 100644
--- a/moonlander/keymaps/sroccaserra/keymap.c
+++ b/moonlander/keymaps/sroccaserra/keymap.c
@@ -83,6 +83,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 };
 
+///
+// Start combos
+
+// Note: also update COMBO_COUNT in config.h
+//
+// - https://docs.qmk.fm/#/keycodes
+// - https://github.com/qmk/qmk_firmware/blob/master/docs/feature_combo.md
+
+const uint16_t PROGMEM esc_combo[] = { KC_E, KC_R, COMBO_END };
+const uint16_t PROGMEM enter_combo[] = { KC_COMMA, KC_DOT, COMBO_END };
+
+combo_t key_combos[COMBO_COUNT] = {
+    COMBO(esc_combo, KC_ESCAPE),
+    COMBO(enter_combo, KC_ENTER),
+};
+
+// End combos
+///
+
 extern bool g_suspend_state;
 extern rgb_config_t rgb_matrix_config;
 
diff --git a/moonlander/keymaps/sroccaserra/rules.mk b/moonlander/keymaps/sroccaserra/rules.mk
index d4062ea..dc5b7dd 100644
--- a/moonlander/keymaps/sroccaserra/rules.mk
+++ b/moonlander/keymaps/sroccaserra/rules.mk
@@ -6,3 +6,5 @@ MOUSEKEY_ENABLE = no
 WEBUSB_ENABLE = yes
 ORYX_ENABLE = yes
 SRC = matrix.c
+
+COMBO_ENABLE = yes