Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 18517)
+++ wp-includes/general-template.php	(working copy)
@@ -1739,7 +1739,7 @@
 			!$is_iphone && // this includes all Safari mobile browsers
 			( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) ||
 				!preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) )
-				&& 'comment.php' != $pagenow ) {
+		) {
 			$wp_rich_edit = true;
 		} else {
 			$wp_rich_edit = false;
Index: wp-includes/class-wp-editor.php
===================================================================
--- wp-includes/class-wp-editor.php	(revision 18517)
+++ wp-includes/class-wp-editor.php	(working copy)
@@ -82,7 +82,7 @@
 		if ( !empty($set['editor_css']) )
 			echo $set['editor_css'] . "\n";
 
-		if ( $this->can_richedit || $set['media_buttons'] ) {
+		if ( ( ! empty( $buttons) && $this->can_richedit ) || $set['media_buttons'] ) {
 			echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools">';
 			echo $buttons;