diff --git a/main/inc/lib/fckeditor/myconfig.php b/main/inc/lib/fckeditor/myconfig.php
index 2bdbc1dc36..b5d163618d 100644
--- a/main/inc/lib/fckeditor/myconfig.php
+++ b/main/inc/lib/fckeditor/myconfig.php
@@ -84,8 +84,10 @@ $config['LoadPlugin'][] = 'tablecommands';
 // audio: Adds a dialog for inserting audio files (.mp3).
 $config['LoadPlugin'][] = 'audio';
 
-// glossary: this plugin add a term from glossary tool in dokeos 
-$config['LoadPlugin'][] = 'glossary';
+// glossary: this plugin add a term from glossary tool in Dokeos.
+if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
+	$config['LoadPlugin'][] = 'glossary';
+}
 
 // MP3 : This is the old plugin for inserting audio files. Probably this plugin will be removed at the next release.
 // If you wish to use it, disable the "audio" plugin first.
diff --git a/main/inc/lib/fckeditor/toolbars/documents.php b/main/inc/lib/fckeditor/toolbars/documents.php
index a9cb6339de..b4eb50da2f 100644
--- a/main/inc/lib/fckeditor/toolbars/documents.php
+++ b/main/inc/lib/fckeditor/toolbars/documents.php
@@ -5,37 +5,17 @@
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
 // This is the visible toolbar set when the editor has "normal" size.
-
-if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','FitWindow','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink','Anchor'),
+	array('Link','Unlink','Anchor','Glossary'),
 	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
 	array('Table','SpecialChar'),
 	array('Outdent','Indent','-','TextColor','BGColor','-','OrderedList','UnorderedList','-','Source'),
-	'/',	
+	'/',
 	array('Style','FontFormat','FontName','FontSize'),
 	array('Bold','Italic','Underline'),
-	array('JustifyLeft','JustifyCenter','JustifyRight'),
-	array('Glossary')		
+	array('JustifyLeft','JustifyCenter','JustifyRight')
 );
-} else {
-	
-$config['ToolbarSets']['Normal'] = array(
-	array('Save','FitWindow','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink','Anchor'),
-	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-	array('Table','SpecialChar'),
-	array('Outdent','Indent','-','TextColor','BGColor','-','OrderedList','UnorderedList','-','Source'),
-	'/',	
-	array('Style','FontFormat','FontName','FontSize'),
-	array('Bold','Italic','Underline'),
-	array('JustifyLeft','JustifyCenter','JustifyRight')		
-);	
-	
-}
-
-
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.