diff --git a/kicad/project_tree_pane.cpp b/kicad/project_tree_pane.cpp
index 2528caf35c..0822f62789 100644
--- a/kicad/project_tree_pane.cpp
+++ b/kicad/project_tree_pane.cpp
@@ -1143,7 +1143,7 @@ void PROJECT_TREE_PANE::onIdle( wxIdleEvent& aEvent )
         FileWatcherReset();
     }
 
-    if( m_selectedItem != nullptr )
+    if( m_selectedItem != nullptr && m_TreeProject->GetRootItem().IsOk() )
     {
         // Make sure m_selectedItem still exists in the tree before activating it.
         std::vector<wxTreeItemId> validItemIds;