Index: main/plugin-thesaurus/resources/js/Ametys/plugins/thesaurus/tool/ThesaurusTreePanel.i18n.js
===================================================================
--- main/plugin-thesaurus/resources/js/Ametys/plugins/thesaurus/tool/ThesaurusTreePanel.i18n.js	(revision 31878)
+++ main/plugin-thesaurus/resources/js/Ametys/plugins/thesaurus/tool/ThesaurusTreePanel.i18n.js	(working copy)
@@ -884,10 +884,16 @@
 					}
 					else
 					{
+						//we do not have any microthesaurus
+						var rootNode = this.getRootNode();
+						rootNode.set('text', "<i18n:text i18n:key='PLUGINS_THESAURUS_TREE_ROOT_DEFAULT_TEXT'/>");
+						rootNode.commit();
+						
 						if (Ext.isFunction(callback))
 						{
 							callback();
 						}
+						this.refreshNode();
 					}
 				}
 			});
@@ -950,8 +956,11 @@
 			node = selection.length > 0 ? selection[0] : null;
 			
 			// Workaround - Refresh selection in case node is not existing anymore (deleted by another user for example).
-			this.getSelectionModel().deselect(node);
-			this.getSelectionModel().select(node);
+			if (node != null)
+			{
+				this.getSelectionModel().deselect(node);
+				this.getSelectionModel().select(node);
+			}
 		}
 		else
 		{