diff --git a/src/kaleidoscope/plugin/EEPROM-Settings.cpp b/src/kaleidoscope/plugin/EEPROM-Settings.cpp
index b75e181e..31cc4990 100644
--- a/src/kaleidoscope/plugin/EEPROM-Settings.cpp
+++ b/src/kaleidoscope/plugin/EEPROM-Settings.cpp
@@ -53,6 +53,8 @@ uint8_t EEPROMSettings::default_layer(uint8_t layer) {
   if (layer == 0xff)
     return settings_.default_layer;
 
+  if (settings_.default_layer != layer)
+    Layer.move(layer);
   settings_.default_layer = layer;
   update();
   return settings_.default_layer;