diff --git a/src/app/components/pb-schema/pb-schema.component.ts b/src/app/components/pb-schema/pb-schema.component.ts
index 0ba88a7ba42a33c915f3d089a832d54d19f0bf57..eab19cd1f6e15b5e7d9457ce71c75273fac46851 100644
--- a/src/app/components/pb-schema/pb-schema.component.ts
+++ b/src/app/components/pb-schema/pb-schema.component.ts
@@ -451,6 +451,7 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
             }
         }
         this.clearResults();
+        this.unselect();
         this.refreshWithSelection();
         this.calculatorComponent.showPBInputData = true;
     }
@@ -668,7 +669,6 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
         console.debug(`PbSchemaComponent.refreshWithSelection(${uid})`);
         // remember previously selected node
         const selectedNodeUID = this._selectedItem?.uid;
-        this.unselect();
         this.refresh();
         // select a specific node on the schema
         if (uid !== undefined) {