diff --git a/AUTHORS b/AUTHORS
index fff57e54..c4029fdc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
 Bartosz Taudul <wolf.pld@gmail.com>
+Kamil Klimek <kamil.klimek@sharkbits.com>
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 5c6dc36f..0979e930 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -1723,6 +1723,19 @@ const char* View::ShortenNamespace( const char* name ) const
     }
 }
 
+void View::DrawHelpMarker( const char* desc ) const
+{
+    ImGui::TextDisabled( "(?)" );
+    if ( ImGui::IsItemHovered() )
+    {
+        ImGui::BeginTooltip();
+        ImGui::PushTextWrapPos( 450.0f );
+        ImGui::TextUnformatted( desc );
+        ImGui::PopTextWrapPos();
+        ImGui::EndTooltip();
+    }
+}
+
 void View::DrawTextContrast( ImDrawList* draw, const ImVec2& pos, uint32_t color, const char* text )
 {
     draw->AddText( pos + ImVec2( 1, 1 ), 0x88000000, text );
@@ -1757,6 +1770,8 @@ void View::DrawImpl()
     ImGui::SameLine();
     if( ImGui::Button( "Messages", ImVec2( 70, 0 ) ) ) m_showMessages = true;
     ImGui::SameLine();
+    if ( ImGui::Button( "Find Zone", ImVec2( 70, 0 ) ) ) m_findZone.show = true;
+    ImGui::SameLine();
     ImGui::Text( "Frames: %-7" PRIu64 " Time span: %-10s View span: %-10s Zones: %-13s Queue delay: %s  Timer resolution: %s", m_frames.size(), TimeToString( m_lastTime - m_frames[0] ), TimeToString( m_zvEnd - m_zvStart ), RealToString( m_zonesCnt, true ), TimeToString( m_delay ), TimeToString( m_resolution ) );
     DrawFrames();
     DrawZones();
@@ -1769,6 +1784,7 @@ void View::DrawImpl()
 
     if( m_showOptions ) DrawOptions();
     if( m_showMessages ) DrawMessages();
+    if( m_findZone.show ) DrawFindZone();
 
     if( m_zoomAnim.active )
     {
@@ -4124,6 +4140,81 @@ void View::DrawMessages()
     ImGui::End();
 }
 
+void View::DrawFindZone()
+{
+    ImGui::Begin( "Find Zone", &m_findZone.show );
+    ImGui::InputText( "", m_findZone.pattern, 1024 );
+    ImGui::SameLine();
+
+    bool findClicked = ImGui::Button( "Find" );
+
+    ImGui::SameLine();
+
+    if( ImGui::Button( "Clear" ) )
+    {
+        m_findZone.result.clear();
+    }
+
+    if( ImGui::TreeNode( "Options" ) )
+    {
+        ImGui::InputInt( "max zones per thread", &m_findZone.maxZonesPerThread );
+        ImGui::SameLine();
+        DrawHelpMarker( "0 for unlimitted.\nHigh value or unlimmited zone search may lead to performance issues." );
+        ImGui::InputInt( "max depth", &m_findZone.maxDepth );
+        ImGui::SameLine();
+        DrawHelpMarker( "-1 for unlimitted." );
+        ImGui::TreePop();
+    }
+
+    if ( findClicked )
+    {
+        m_findZone.result.clear();
+        FindZones();
+    }
+
+    ImGui::Separator();
+
+    for( const auto &v : m_findZone.result )
+    {
+        if( ImGui::TreeNode( GetThreadString( v->id ) ) )
+        {
+            ImGui::Columns( 3, GetThreadString( v->id ) );
+            ImGui::Separator();
+            ImGui::Text( "Name" );
+            ImGui::NextColumn();
+            ImGui::Text( "Time from start" );
+            ImGui::NextColumn();
+            ImGui::Text( "Execution time" );
+            ImGui::NextColumn();
+            ImGui::Separator();
+
+            for( auto ev : v->timeline )
+            {
+                ImGui::PushID( ev );
+
+                auto& srcloc = GetSourceLocation( ev->srcloc );
+                if( ImGui::Selectable( GetString( srcloc.name.active ? srcloc.name : srcloc.function ), m_zoneInfoWindow == ev, ImGuiSelectableFlags_SpanAllColumns ) )
+                    m_zoneInfoWindow = ev;
+
+                ImGui::NextColumn();
+
+                ImGui::Text( TimeToString( ev->start - m_frames[0] ) );
+                ImGui::NextColumn();
+                const auto end = GetZoneEnd( *ev );
+                ImGui::Text( TimeToString( end - ev->start ) );
+                ImGui::NextColumn();
+
+                ImGui::PopID();
+            }
+            ImGui::Columns( 1 );
+            ImGui::Separator();
+            ImGui::TreePop();
+        }
+    }
+
+    ImGui::End();
+}
+
 uint32_t View::GetZoneColor( const ZoneEvent& ev )
 {
     auto& srcloc = GetSourceLocation( ev.srcloc );
@@ -4357,6 +4448,38 @@ const GpuEvent* View::GetZoneParent( const GpuEvent& zone ) const
     return nullptr;
 }
 
+void View::FindZones()
+{
+    for( auto v : m_threads )
+    {
+        auto thrOut = std::make_unique<ThreadData>();
+        FindZones( v->timeline, thrOut->timeline, m_findZone.maxDepth );
+
+        if ( thrOut->timeline.size() )
+        {
+            thrOut->id = v->id;
+            m_findZone.result.push_back( std::move( thrOut ) );
+        }
+    }
+}
+
+void View::FindZones( const Vector<ZoneEvent*> &events, Vector<ZoneEvent*> &out, const int maxdepth )
+{
+    for ( ZoneEvent *ev : events )
+    {
+        if ( out.size() >= m_findZone.maxZonesPerThread )
+            break;
+
+        auto& srcloc = GetSourceLocation( ev->srcloc );
+        const auto str = GetString( srcloc.name.active ? srcloc.name : srcloc.function );
+
+        if ( strstr( str, m_findZone.pattern ) )
+            out.push_back( ev );
+
+        if ( maxdepth != 0 ) FindZones( ev->child, out, maxdepth - 1 );
+    }
+}
+
 void View::Write( FileWrite& f )
 {
     f.Write( &m_delay, sizeof( m_delay ) );
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index 376a842b..11483f1e 100644
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -134,6 +134,8 @@ private:
 
     const char* ShortenNamespace( const char* name ) const;
 
+    void DrawHelpMarker( const char* desc ) const;
+
     void DrawTextContrast( ImDrawList* draw, const ImVec2& pos, uint32_t color, const char* text );
 
     void DrawImpl();
@@ -148,6 +150,7 @@ private:
     void DrawPlotPoint( const ImVec2& wpos, float x, float y, int offset, uint32_t color, bool hover, bool hasPrev, double val, double prev, bool merged );
     void DrawOptions();
     void DrawMessages();
+    void DrawFindZone();
 
     void DrawInfoWindow();
     void DrawZoneInfoWindow();
@@ -171,6 +174,9 @@ private:
     const ZoneEvent* GetZoneParent( const ZoneEvent& zone ) const;
     const GpuEvent* GetZoneParent( const GpuEvent& zone ) const;
 
+    void FindZones();
+    void FindZones( const Vector<ZoneEvent*> &events, Vector<ZoneEvent*> &out, const int maxdepth = 0 );
+
     void Write( FileWrite& f );
     void WriteTimeline( FileWrite& f, const Vector<ZoneEvent*>& vec );
     void WriteTimeline( FileWrite& f, const Vector<GpuEvent*>& vec );
@@ -276,6 +282,14 @@ private:
     Namespace m_namespace;
     Animation m_zoomAnim;
 
+    struct {
+        bool show;
+        std::vector<std::unique_ptr<ThreadData>> result;
+        char pattern[1024] = { "" };
+        int maxZonesPerThread = 1000;
+        int maxDepth = 10;
+    } m_findZone;
+
     bool m_terminate;
 };