From 3a77228aaa5ab63b9082a027a3bfa0e0fbaeaef4 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:54:26 +0100
Subject: [PATCH] Fix retention of selected item of novel tree in the details
 panel

---
 novelwriter/gui/noveltree.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/novelwriter/gui/noveltree.py b/novelwriter/gui/noveltree.py
index cfd103a5..25cdc5f9 100644
--- a/novelwriter/gui/noveltree.py
+++ b/novelwriter/gui/noveltree.py
@@ -529,13 +529,14 @@ class GuiNovelTree(QTreeWidget):
         return
 
     def getSelectedHandle(self):
-        """Get the currently selected handle. If multiple items are
-        selected, return the first.
+        """Get the currently selected or active handle. If multiple
+        items are selected, return the first.
         """
-        selItem = self.selectedItems()
-        if selItem:
-            tHandle = selItem[0].data(self.C_TITLE, self.D_HANDLE)
-            sTitle = selItem[0].data(self.C_TITLE, self.D_TITLE)
+        selList = self.selectedItems()
+        trItem = selList[0] if selList else self.currentItem()
+        if isinstance(trItem, QTreeWidgetItem):
+            tHandle = trItem.data(self.C_TITLE, self.D_HANDLE)
+            sTitle = trItem.data(self.C_TITLE, self.D_TITLE)
             return tHandle, sTitle
         return None, None