diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs
index f936ee035..5b1d3e73a 100644
--- a/renderdocui/Windows/ShaderViewer.cs
+++ b/renderdocui/Windows/ShaderViewer.cs
@@ -370,6 +370,12 @@ namespace renderdocui.Windows
             if (m_FindAll == null)
                 m_FindAll = new FindAllDialog(FindAllFiles);
 
+            if (m_FindAll.Visible)
+            {
+                m_FindAll.Activate();
+                return;
+            }
+
             m_FindAll.Show(this);
         }