diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 09066ea3ba..adbf856a99 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -89,7 +89,8 @@ input#link_url {
 	margin-top: -1px;
 }
 
-#edit-slug-box {
+#edit-slug-box,
+#comment-link-box {
 	line-height: 24px;
 	min-height: 25px; /* Yes, line-height + 1 */
 	margin-top: 5px;
@@ -102,6 +103,11 @@ input#link_url {
 	font-size: 11px;
 }
 
+#comment-link-box {
+	margin: 5px 0;
+	padding: 0 5px;
+}
+
 #editable-post-name-full {
 	display: none;
 }
diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
index 426d86db40..30f3a34cb9 100644
--- a/src/wp-admin/edit-form-comment.php
+++ b/src/wp-admin/edit-form-comment.php
@@ -22,6 +22,17 @@ if ( !defined('ABSPATH') )
 
 <div id="post-body" class="metabox-holder columns-2">
 <div id="post-body-content" class="edit-form-section edit-comment-section">
+<?php
+if ( $comment->comment_post_ID > 0 ):
+	$comment_link = get_comment_link( $comment );
+?>
+<div class="inside">
+	<div id="comment-link-box">
+		<strong><?php _ex( 'Permalink:', 'comment' ); ?></strong>
+		<span id="sample-permalink"><a href="<?php echo $comment_link; ?>"><?php echo $comment_link; ?></a></span>
+	</div>
+</div>
+<?php endif; ?>
 <div id="namediv" class="stuffbox">
 <div class="inside">
 <fieldset>
@@ -67,13 +78,6 @@ if ( !defined('ABSPATH') )
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
 
-<div id="minor-publishing-actions">
-<div id="preview-action">
-<a class="preview button" href="<?php echo get_comment_link( $comment ); ?>" target="_blank"><?php _e('View Comment'); ?></a>
-</div>
-<div class="clear"></div>
-</div>
-
 <div id="misc-publishing-actions">
 
 <fieldset class="misc-pub-section misc-pub-comment-status" id="comment-status-radio">
@@ -120,7 +124,7 @@ if ( current_user_can( 'edit_post', $post_id ) ) {
 if ( $comment->comment_parent ) :
 	$parent      = get_comment( $comment->comment_parent );
 	if ( $parent ) :
-		$parent_link = esc_url( get_comment_link( $comment ) );
+		$parent_link = esc_url( get_comment_link( $parent ) );
 		$name        = get_comment_author( $parent );
 	?>
 	<div class="misc-pub-section misc-pub-reply-to">