diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp
index ff44690f..2d44c417 100644
--- a/source/Core/Threads/GUIThread.cpp
+++ b/source/Core/Threads/GUIThread.cpp
@@ -34,10 +34,11 @@ extern "C" {
 #define MOVEMENT_INACTIVITY_TIME (60 * configTICK_RATE_HZ)
 #define BUTTON_INACTIVITY_TIME   (60 * configTICK_RATE_HZ)
 
-ButtonState buttonsAtDeviceBoot; // We record button state at startup, incase of jumping to debug modes
+ButtonState   buttonsAtDeviceBoot;                                      // We record button state at startup, incase of jumping to debug modes
+OperatingMode currentOperatingMode = OperatingMode::InitialisationDone; // Current mode we are rendering
+guiContext    context;                                                  // Context passed to functions to aid in state during render passes
 
-OperatingMode currentOperatingMode; // Current mode we are rendering
-guiContext    context;              // Context passed to functions to aid in state during render passes
+OperatingMode handle_post_init_state();
 
 void guiRenderLoop(void) {
   OLED::clearScreen(); // Clear ready for render pass
@@ -106,6 +107,7 @@ void guiRenderLoop(void) {
   case OperatingMode::SettingsMenu:
     break;
   case OperatingMode::InitialisationDone:
+    newMode = handle_post_init_state();
     break;
   case OperatingMode::Hibernating:
     break;
@@ -134,6 +136,9 @@ void guiRenderLoop(void) {
       break;
     case TransitionAnimation::Right:
       break;
+    case TransitionAnimation::None:
+    default:
+      break; // Do nothing on unknown
     }
     OLED::useSecondaryFramebuffer(false);
     context.transitionMode = TransitionAnimation::None; // Clear transition flag
@@ -180,6 +185,7 @@ void startGUITask(void const *argument) {
   bool buttonLockout = false;
   renderHomeScreenAssets();
   getTipRawTemp(1); // reset filter
+  memset(&context, 0, sizeof(context));
 
   OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
   buttonsAtDeviceBoot = getButtonState();
@@ -197,6 +203,7 @@ void startGUITask(void const *argument) {
   //   currentTempTargetDegC = min(sleepTempDegC, 75);
   // }
   // TODO
+
   TickType_t startRender = xTaskGetTickCount();
   for (;;) {
     guiRenderLoop();
diff --git a/source/Core/Threads/OperatingModes/HomeScreen.cpp b/source/Core/Threads/OperatingModes/HomeScreen.cpp
index 502fe1d2..7c9321c6 100644
--- a/source/Core/Threads/OperatingModes/HomeScreen.cpp
+++ b/source/Core/Threads/OperatingModes/HomeScreen.cpp
@@ -60,6 +60,7 @@ OperatingMode handleHomeButtons(const ButtonState buttons, guiContext *cxt) {
   default:
     break;
   }
+  return OperatingMode::HomeScreen;
 }
 
 void drawDetailedHomeScreen(uint32_t tipTemp) {
diff --git a/source/Core/Threads/OperatingModes/Sleep.cpp b/source/Core/Threads/OperatingModes/Sleep.cpp
index bdfa76c4..60f3fc31 100644
--- a/source/Core/Threads/OperatingModes/Sleep.cpp
+++ b/source/Core/Threads/OperatingModes/Sleep.cpp
@@ -2,7 +2,7 @@
 
 OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *cxt) {
 #ifdef NO_SLEEP_MODE
-  return OperatingMode::SolderingMode;
+  return OperatingMode::Soldering;
 #endif
   // Drop to sleep temperature and display until movement or button press