diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 6631b962ba..c780571806 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -10,7 +10,9 @@ $messages[3] = __('Custom field deleted.');
 <form name="post" action="post.php" method="post" id="post">
 
 <div class="wrap">
-<h2><?php _e('Write Post'); ?></h2>
+<a id="write-post"></a>
+<h2><?php _e('Write Post'); ?><?php if ( 0 != $post_ID ) : ?>
+ <small class="quickjump"><a href="#preview-post"><?php _e('preview &darr;'); ?></a></small><?php endif; ?></h2>
 <?php
 
 if (0 == $post_ID) {
diff --git a/wp-admin/post.php b/wp-admin/post.php
index f22401a9c4..95a386fbe4 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -78,15 +78,9 @@ case 'edit':
 
 	?>
 	<div id='preview' class='wrap'>
-	<h2><?php _e('Post Preview (updated when post is saved)'); ?></h2>
-	<h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__("Permanent Link: %s"), get_the_title()); ?>"><?php the_title(); ?></a></h3>
-	<div class="meta"><?php _e("Filed under:"); ?> <?php the_category(','); ?> &#8212; <?php the_author() ?> @ <?php the_time() ?></div>
-
-	<div class="storycontent">
-	<?php 
-	echo apply_filters('the_content', html_entity_decode($post->post_content) );
-	?>
-	</div>
+	<a id="preview-post"></a>
+	<h2><?php _e('Post Preview (updated when post is saved)'); ?> <small class="quickjump"><a href="#write-post"><?php _e('edit &uarr;'); ?></a></small></h2>
+		<iframe src="<?php the_permalink(); ?>" width="100%" height="600" />
 	</div>
 	<?php
 	break;
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index f8920b98b1..df6f34e288 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -114,6 +114,19 @@ h2 {
 	margin: 5px 10px;
 }
 
+h2 small.quickjump {
+	display: block;
+	text-align: right;
+}
+
+h2 small.quickjump a {
+	text-decoration: none;
+	border-bottom: 0;
+	font-size: 15px;
+	background: #f0f8ff;
+	padding: 5px 10px;
+}
+
 img, #footer a {
 	border: 0;
 }