diff --git a/src/editor.js b/src/editor.js
index d814029..70716a7 100644
--- a/src/editor.js
+++ b/src/editor.js
@@ -36,6 +36,7 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
   events_queue = [];
   editor_options = [];
   snippets = {};
+  treeview = null;
   // #endregion
 
   // #region public API
@@ -1420,12 +1421,15 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
   showVariablesDescription = function(variablesJSON) {    
     
     try {
-
-      showVariablesDisplay();
+      
+      if (treeview != null)
+        hideVariablesDisplay();
 
       const variables = JSON.parse(variablesJSON);
       treeview = new Treeview("#variables-tree", editor, "./tree/icons/");
       treeview.replaceData(variables);
+      showVariablesDisplay();
+
       return true;
 
     }
@@ -3118,6 +3122,8 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
     let element = document.getElementById("display");
     element.style.height = "0";
     element.style.display = "none";
+    treeview.dispose();
+    treeview = null;
 
   }
 
diff --git a/src/tree/tree.js b/src/tree/tree.js
index 905ce2f..be241bb 100644
--- a/src/tree/tree.js
+++ b/src/tree/tree.js
@@ -104,5 +104,8 @@ class Treeview {
     this.open(id);
     document.getElementById(id).focus();
     document.getElementById(id).click();
-  }
+  };
+  dispose() {
+  	document.querySelector(this.treeviewId).innerHTML = '';
+  };
 }
\ No newline at end of file