diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 34c4c342f..3852daf0b 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -475,4 +475,17 @@ function extract_from_markers($filename, $marker) {
  return $result;
 }
 
+function the_quicktags () {
+// Browser detection sucks, but until Safari supports the JS needed for this to work people just assume it's a bug in WP
+if ( !strstr($_SERVER['HTTP_USER_AGENT'], 'Safari') ) :
+	echo '
+	<div id="quicktags">
+	<a href="http://wordpress.org/docs/reference/post/#quicktags" title="' .  __('Help with quicktags') . '">' . __('Quicktags') . '</a>:
+	<script src="quicktags.js" type="text/javascript"></script>
+	<script type="text/javascript">edToolbar();</script>
+';
+	echo '</div>';
+endif;
+}
+
 ?>
\ No newline at end of file
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 2912094d8..24e2d1d96 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -94,12 +94,7 @@ window.onload = focusit;
 
 <fieldset id="postdiv">
        <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php _e('Post') ?></a></legend>
-		<div id="quicktags">
-<?php
-	echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="' .  __('Help with quicktags') . '">' . __('Quicktags') . '</a>: ';
-	include('quicktags.php');
-?>
-</div>
+<?php the_quicktags(); ?>
 <?php
  $rows = get_settings('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 73cfb51d2..876b655c5 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -39,12 +39,7 @@ window.onload = focusit;
 
 <fieldset style="clear: both;">
         <legend><?php _e('Comment') ?></legend>
-		<div id="quicktags">
-<?php
-	echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="' . __('Help with quicktags') . '">' . __('Quicktags') . '</a>: ';
-	include('quicktags.php');
-?>
-</div>
+<?php the_quicktags(); ?>
 <?php
  $rows = get_settings('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 4c396c1f1..971cda176 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -49,14 +49,7 @@ window.onload = focusit;
 <br />
 <fieldset id="postdiv">
     <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php _e('Post') ?></a></legend>
-		<div id="quicktags">
-<?php
-if ('bookmarklet' != $mode) {
-	echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="' . __('Help with quicktags') . '">' . __('Quicktags') . '</a>: ';
-	include('quicktags.php');
-}
-?>
-</div>
+<?php the_quicktags(); ?>
 <?php
  $rows = get_settings('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index e4dcec859..8d53e9ab3 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -34,14 +34,7 @@ window.onload = focusit;
 <br />
 <fieldset id="postdiv">
     <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with page field') ?>"><?php _e('Page') ?></a></legend>
-		<div id="quicktags">
-<?php
-if ('bookmarklet' != $mode) {
-	echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="' . __('Help with quicktags') . '">' . __('Quicktags') . '</a>: ';
-	include('quicktags.php');
-}
-?>
-</div>
+<?php the_quicktags(); ?>
 <?php
  $rows = get_settings('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
diff --git a/wp-admin/quicktags.php b/wp-admin/quicktags.php
deleted file mode 100644
index 25256660a..000000000
--- a/wp-admin/quicktags.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<script src="quicktags.js" type="text/javascript"></script>
-<script type="text/javascript">edToolbar();</script>
\ No newline at end of file