diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index aef9074d0..1e462270e 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -670,7 +670,9 @@ function extraNetworksBtnDirsViewItemOnClick(event, tabname_full) {
         // Select the corresponding tree view button.
         if ("selected" in elem.dataset) {
             const tree_row = tab.container_elem.querySelector(`.tree-list-item[data-path="${elem.textContent.trim()}"]`);
-            tab.tree_list.onRowSelected(tree_row.dataset.divId, tree_row);
+            if (isElement(tree_row)) {
+                tab.tree_list.onRowSelected(tree_row.dataset.divId, tree_row);
+            }
         }
     };
 
diff --git a/javascript/extraNetworksClusterize.js b/javascript/extraNetworksClusterize.js
index 12d280087..66c6fac6e 100644
--- a/javascript/extraNetworksClusterize.js
+++ b/javascript/extraNetworksClusterize.js
@@ -261,6 +261,9 @@ class ExtraNetworksClusterizeTreeList extends ExtraNetworksClusterize {
             if (!isNullOrUndefined(this.selected_div_id) && keyExistsLogError(this.data_obj, this.selected_div_id)) {
                 this.data_obj[this.selected_div_id].selected = false;
                 this.selected_div_id = null;
+                for (const elem of this.content_elem.children) {
+                    delete elem.dataset.selected;
+                }
             }
             return;
         }