diff --git a/src/Kaleidoscope/EEPROM-Keymap.cpp b/src/Kaleidoscope/EEPROM-Keymap.cpp
index 0d2b00c6..5a0a6636 100644
--- a/src/Kaleidoscope/EEPROM-Keymap.cpp
+++ b/src/Kaleidoscope/EEPROM-Keymap.cpp
@@ -117,7 +117,6 @@ bool EEPROMKeymap::focusKeymapLayer(const char *command) {
     return false;
   }
   uint16_t keysPerLayer = ROWS * COLS;
-  uint16_t offset = layer * keysPerLayer;
   if (Serial.peek() == '\n') {
     for (uint8_t row = 0; row < ROWS; row++) {
       for (uint8_t col = 0; col < COLS; col++) {
@@ -127,8 +126,9 @@ bool EEPROMKeymap::focusKeymapLayer(const char *command) {
       }
     }
   } else {
+    uint16_t offset = layer * keysPerLayer;
     for (uint16_t k = 0; (k < keysPerLayer) && (Serial.peek() != '\n'); k++) {
-      updateKey(layer + k, parseKey());
+      updateKey(offset + k, parseKey());
     }
   }