From 9bb8176d341e769af5080cc22a45a433d75b8318 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 29 Jan 2020 01:06:06 -0500
Subject: [PATCH] Fix Toolchange (!no_move) return to status (#16699)

---
 Marlin/src/feature/binary_protocol.h | 2 +-
 Marlin/src/module/tool_change.cpp    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/feature/binary_protocol.h b/Marlin/src/feature/binary_protocol.h
index 0025fbe138..8e69ab7a75 100644
--- a/Marlin/src/feature/binary_protocol.h
+++ b/Marlin/src/feature/binary_protocol.h
@@ -242,7 +242,7 @@ public:
       uint8_t protocol() { return (meta >> 4) & 0xF; }
       uint8_t type() { return meta & 0xF; }
       void reset() { token = 0; sync = 0; meta = 0; size = 0; checksum = 0; }
-      uint8_t data[1];
+      uint8_t data[2];
     };
 
     union Footer {
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 324b979570..b42722b87c 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -821,6 +821,10 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)");
     }
 
+    #if HAS_LCD_MENU
+      if (!no_move) ui.return_to_status();
+    #endif
+
     #if ENABLED(DUAL_X_CARRIAGE)
       const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE;
     #else