diff --git a/tag/index.php b/tag/index.php
index d3c60a57e22..1c5719d4bda 100644
--- a/tag/index.php
+++ b/tag/index.php
@@ -64,6 +64,8 @@ if ($tag->flag > 0 && has_capability('moodle/tag:manage', $systemcontext)) {
 
 print_heading($tagname, '', 2, 'headingblock header tag-heading');
 
+print_tag_management_box($tag);
+
 print_tag_description_box($tag);
 
 
diff --git a/tag/lib.php b/tag/lib.php
index 572bd91fe49..f403f553172 100644
--- a/tag/lib.php
+++ b/tag/lib.php
@@ -1146,18 +1146,18 @@ function print_tag_description_box($tag_object) {
     $tagname  = tag_display_name($tag_object);
     $related_tags =  related_tags($tag_object->id); //get_item_tags('tags',$tag_object->id);
 
-    print_box_start('generalbox', 'tag-description');
 
-    print_tag_management_box($tag_object);
+    print_box_start('generalbox', 'tag-description');
     
     if (!empty($tag_object->description)) {
-        echo format_text($tag_object->description, $tag_object->descriptionformat );
+        $options = new object;
+        $options->para=false;
+        echo format_text($tag_object->description, $tag_object->descriptionformat, $options );
     }
     else {
         echo format_text(get_string('thistaghasnodesc','tag'));
     }
 
-
     if ($related_tags) {
         echo '<br/><br/><b>'.get_string('relatedtags','tag').': </b>' . tag_links_csv($related_tags);
     }