diff --git a/novelwriter/gui/docviewerpanel.py b/novelwriter/gui/docviewerpanel.py
index e428ae53..3194f823 100644
--- a/novelwriter/gui/docviewerpanel.py
+++ b/novelwriter/gui/docviewerpanel.py
@@ -121,7 +121,7 @@ class GuiDocViewerPanel(QWidget):
     def clearClassTabs(self) -> None:
         """Clear all the class tabs"""
         for cTab in self.kwTabs.values():
-            cTab.clear()
+            cTab.clearContent()
         return
 
     ##
@@ -349,6 +349,12 @@ class _ViewPanelKeyWords(QTreeWidget):
         """Return the number of items in the list."""
         return self.topLevelItemCount()
 
+    def clearContent(self) -> None:
+        """Clear the list."""
+        self._tagMap = {}
+        self.clear()
+        return
+
     def addUpdateEntry(self, tag: str, name: str, iItem: IndexItem, hItem: IndexHeading) -> None:
         """Add a new entry, or update an existing one."""
         nwItem = iItem.item