diff --git a/src/dusk/imgui/ImGuiConsole.cpp b/src/dusk/imgui/ImGuiConsole.cpp
index cc8b758cb7..60ba229ead 100644
--- a/src/dusk/imgui/ImGuiConsole.cpp
+++ b/src/dusk/imgui/ImGuiConsole.cpp
@@ -174,6 +174,7 @@ namespace dusk {
 
     void ImGuiConsole::draw() {
         if (CheckMenuViewToggle(ImGuiKey_F1, m_isHidden)) {
+            m_menuTools.afterDraw();
             return;
         }
 
@@ -187,6 +188,8 @@ namespace dusk {
 
             ImGui::EndMainMenuBar();
         }
+
+        m_menuTools.afterDraw();
     }
 
     bool ImGuiConsole::CheckMenuViewToggle(ImGuiKey key, bool& active) {
diff --git a/src/dusk/imgui/ImGuiMenuTools.hpp b/src/dusk/imgui/ImGuiMenuTools.hpp
index 35703d8aa2..66c820dd78 100644
--- a/src/dusk/imgui/ImGuiMenuTools.hpp
+++ b/src/dusk/imgui/ImGuiMenuTools.hpp
@@ -23,6 +23,7 @@ namespace dusk {
 
         ImGuiMenuTools();
         void draw();
+        void afterDraw();
 
 		void ShowDebugOverlay();
 		void ShowCameraOverlay();
diff --git a/src/dusk/imgui/ImGuiStubLog.cpp b/src/dusk/imgui/ImGuiStubLog.cpp
index 5f77dccd38..d8638da297 100644
--- a/src/dusk/imgui/ImGuiStubLog.cpp
+++ b/src/dusk/imgui/ImGuiStubLog.cpp
@@ -36,18 +36,20 @@ namespace dusk {
 
         std::lock_guard lock(StubLogMutex);
 
+        if (StubLogBuffer.size() > 1024 * 1024) {
+            DuskLog.warn("Stub log FULL. Dropping logs!");
+            return;
+        }
+
         LineOffsets.push_back(StubLogBuffer.size());
         const auto levelName = LogLevelName(level);
         StubLogBuffer.appendf("[%s | %s] %s\n", levelName, module, message);
     }
 
-    static void ClearPastFrame();
-
     void ImGuiMenuTools::ShowStubLog() {
         std::lock_guard lock(StubLogMutex);
 
         if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F5, m_showStubLog)) {
-            ClearPastFrame();
             return;
         }
 
@@ -78,7 +80,6 @@ namespace dusk {
         }
 
         ImGui::End();
-        ClearPastFrame();
     }
 
     void ClearPastFrame() {
@@ -88,4 +89,10 @@ namespace dusk {
         StubLogBuffer.clear();
         LineOffsets.clear();
     }
+
+    void ImGuiMenuTools::afterDraw() {
+        std::lock_guard lock(StubLogMutex);
+
+        ClearPastFrame();
+    }
 }