diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs
index 24cc8c5a9..1b05bedfe 100644
--- a/renderdocui/Windows/ShaderViewer.cs
+++ b/renderdocui/Windows/ShaderViewer.cs
@@ -2063,6 +2063,9 @@ namespace renderdocui.Windows
 
         private void ShaderViewer_FormClosing(object sender, FormClosingEventArgs e)
         {
+            foreach (var sc in m_Scintillas)
+                sc.FindReplace.Window.Close();
+            m_FindAll.Close();
             if (m_CloseCallback != null)
                 m_CloseCallback();
         }