diff --git a/imgui.cpp b/imgui.cpp
index bc1ac4b78..e12cbae1f 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -2931,6 +2931,7 @@ static void SetCurrentWindow(ImGuiWindow* window)
 {
     ImGuiContext& g = *GImGui;
     g.CurrentWindow = window;
+    g.CurrentTable = window ? window->DC.CurrentTable : NULL;
     if (window)
         g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize();
 }