diff --git a/source/Core/Drivers/OLED.cpp b/source/Core/Drivers/OLED.cpp
index 27f103fc..c97dd35b 100644
--- a/source/Core/Drivers/OLED.cpp
+++ b/source/Core/Drivers/OLED.cpp
@@ -318,9 +318,12 @@ void OLED::transitionSecondaryFramebuffer(bool forwardNavigation) {
     refresh(); // Now refresh to write out the contents to the new page
     vTaskDelayUntil(&startDraw, TICKS_100MS / 7);
     if (getButtonState() != BUTTON_NONE) {
+      memcpy(screenBuffer + FRAMEBUFFER_START, secondFrameBuffer + FRAMEBUFFER_START, sizeof(screenBuffer) - FRAMEBUFFER_START);
+      refresh(); // Now refresh to write out the contents to the new page
       return;
     }
   }
+  refresh(); //
 }
 
 void OLED::useSecondaryFramebuffer(bool useSecondary) {
diff --git a/source/Core/Threads/OperatingModes/CJC.cpp b/source/Core/Threads/OperatingModes/CJC.cpp
index 2359aad1..44b1206c 100644
--- a/source/Core/Threads/OperatingModes/CJC.cpp
+++ b/source/Core/Threads/OperatingModes/CJC.cpp
@@ -11,8 +11,10 @@ OperatingMode performCJCC(const ButtonState buttons, guiContext *cxt) {
       OLED::print(translatedString(Tr->CJCCalibrating), FontStyle::SMALL);
       OLED::setCursor(0, 8);
       OLED::print(SmallSymbolDot, FontStyle::SMALL);
-      for (uint8_t x = 0; x < (cxt->scratch_state.state1 / 4); x++)
+      for (uint8_t x = 0; x < (cxt->scratch_state.state1 / 4); x++) {
         OLED::print(SmallSymbolDot, FontStyle::SMALL);
+      }
+
       cxt->scratch_state.state1++;
       return OperatingMode::CJCCalibration;
     }
diff --git a/source/Core/Threads/OperatingModes/SettingsMenu.cpp b/source/Core/Threads/OperatingModes/SettingsMenu.cpp
index f2c8ff44..0b12e5e3 100644
--- a/source/Core/Threads/OperatingModes/SettingsMenu.cpp
+++ b/source/Core/Threads/OperatingModes/SettingsMenu.cpp
@@ -183,8 +183,7 @@ OperatingMode gui_SettingsMenu(const ButtonState buttons, guiContext *cxt) {
           cxt->transitionMode = TransitionAnimation::Left;
           return OperatingMode::HomeScreen;
         } else {
-          (*subEntry) = 0;
-          (*mainEntry) += 1;
+          (*subEntry) = 0; // Reset back to the main menu
         }
         // When we exit a list we want to animate to the left
         cxt->transitionMode = TransitionAnimation::Left;