diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp
index c59e78e25..cb912801a 100644
--- a/qrenderdoc/Windows/EventBrowser.cpp
+++ b/qrenderdoc/Windows/EventBrowser.cpp
@@ -1246,7 +1246,7 @@ void EventBrowser::ClearFindIcons(RDTreeWidgetItem *parent)
 
 void EventBrowser::ClearFindIcons()
 {
-  if(m_Ctx.IsCaptureLoaded())
+  if(m_Ctx.IsCaptureLoaded() && ui->events->topLevelItemCount() > 0)
     ClearFindIcons(ui->events->topLevelItem(0));
 }
 
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index ccb88cc18..66c4bd991 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -2084,7 +2084,8 @@ void MainWindow::OnCaptureLoaded()
 
   PopulateRecentCaptureFiles();
 
-  ToolWindowManager::raiseToolWindow(m_Ctx.GetEventBrowser()->Widget());
+  if(m_Ctx.HasEventBrowser())
+    ToolWindowManager::raiseToolWindow(m_Ctx.GetEventBrowser()->Widget());
 }
 
 void MainWindow::OnCaptureClosed()