diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index e1acaa2552..3d88d647e9 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -159,9 +159,10 @@ endforeach;
 <?php echo $form_pingback ?>
 <?php echo $form_prevstatus ?>
 
-<div class="tagdiv"><p><?php _e('Enter tags (keywords) that you feel describe this post separated by commas: (ex: dogs, san francisco, cats.)'); ?><br />
-<input type="text" name="tags_input" id="tags_input" size="30" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" />
-</p></div>
+<fieldset id="tagdiv">
+	<legend><?php _e('Tags (separate multiple tags with commas: cats, pet food, dogs)'); ?></legend>
+	<div><input type="text" name="tags_input" id="tags_input" size="30" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></div>
+</fieldset>
 
 <p class="submit">
 <span id="autosave"></span>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 38a845020f..b2225716ba 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -538,7 +538,7 @@ input.disabled, textarea.disabled {
 	border: none;
 }
 
-#postdiv, #titlediv, #guiddiv {
+#postdiv, #titlediv, #guiddiv, #tagdiv {
 	margin: 0 8px 0 0;
 	padding: 0;
 }
@@ -558,7 +558,7 @@ input.disabled, textarea.disabled {
 	line-height: 140%;
 }
 
-#titlediv input, #guiddiv input, #tags_input {
+#titlediv input, #guiddiv input, #tagdiv input {
 	margin: 0;
 	width: 100%;
 }