diff --git a/novelwriter/gui/noveltree.py b/novelwriter/gui/noveltree.py
index 953f3cf4..7a745748 100644
--- a/novelwriter/gui/noveltree.py
+++ b/novelwriter/gui/noveltree.py
@@ -97,9 +97,9 @@ class GuiNovelView(QWidget):
 
     def clearNovelView(self) -> None:
         """Clear project-related GUI content."""
-        # self.novelTree.clearContent()
         self.novelBar.clearContent()
         self.novelBar.setEnabled(False)
+        self.novelTree.clearContent()
         return
 
     def openProjectTasks(self) -> None:
@@ -474,6 +474,11 @@ class GuiNovelTree(NTreeView):
     #  Class Methods
     ##
 
+    def clearContent(self) -> None:
+        """Clear the tree view."""
+        self.setModel(None)
+        return
+
     def resizeColumns(self) -> None:
         """Set the correct column sizes."""
         if (header := self.header()) and (model := self._getModel()) and (vp := self.viewport()):
diff --git a/tests/test_core/test_core_index.py b/tests/test_core/test_core_index.py
index d22fba9f..9ffff298 100644
--- a/tests/test_core/test_core_index.py
+++ b/tests/test_core/test_core_index.py
@@ -28,7 +28,7 @@ import pytest
 
 from novelwriter import SHARED
 from novelwriter.constants import nwFiles
-from novelwriter.core.index import Index, IndexNode, TagsIndex
+from novelwriter.core.index import Index, TagsIndex
 from novelwriter.core.item import NWItem
 from novelwriter.core.project import NWProject
 from novelwriter.enum import nwComment, nwItemClass, nwItemLayout