diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 2d901035..48996e6a 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -2634,6 +2634,14 @@ void View::DrawZoneInfoWindow()
     {
         m_findZone.ShowZone( ev.srcloc, m_worker.GetString( srcloc.name.active ? srcloc.name : srcloc.function ) );
     }
+    if( !m_zoneInfoStack.empty() )
+    {
+        ImGui::SameLine();
+        if( ImGui::Button( "Go back" ) )
+        {
+            m_zoneInfoWindow = m_zoneInfoStack.back_and_pop();
+        }
+    }
 
     ImGui::Separator();
 
@@ -2900,6 +2908,14 @@ void View::DrawGpuInfoWindow()
             ShowZoneInfo( *parent, m_gpuInfoWindowThread );
         }
     }
+    if( !m_gpuInfoStack.empty() )
+    {
+        ImGui::SameLine();
+        if( ImGui::Button( "Go back" ) )
+        {
+            m_gpuInfoWindow = m_gpuInfoStack.back_and_pop();
+        }
+    }
 
     ImGui::Separator();