diff --git a/NEWS b/NEWS
index 68eee624..11a085fa 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ v0.3 (xxxx-xx-xx)
   zone info window.
 - Fixed regression with lock announce processing that appeared during
   worker/viewer split.
+- Allow selecting/unselecting all locks for display.
 
 
 v0.2 (2018-04-05)
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 40637f0f..46c13a2f 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -2783,6 +2783,22 @@ void View::DrawOptions()
         }
         if( expand )
         {
+            if( ImGui::SmallButton( "Select all" ) )
+            {
+                for( const auto& l : m_worker.GetLockMap() )
+                {
+                    Visible( &l.second ) = true;
+                }
+            }
+            ImGui::SameLine();
+            if( ImGui::SmallButton( "Unselect all" ) )
+            {
+                for( const auto& l : m_worker.GetLockMap() )
+                {
+                    Visible( &l.second ) = false;
+                }
+            }
+
             for( const auto& l : m_worker.GetLockMap() )
             {
                 if( l.second.valid )