Index: wp-admin/css/colors-classic.css
===================================================================
--- wp-admin/css/colors-classic.css	(revision 21626)
+++ wp-admin/css/colors-classic.css	(working copy)
@@ -639,7 +639,8 @@
 #media-items a.delete,
 #media-items a.delete-permanently,
 .plugins a.delete,
-.ui-tabs-nav a {
+.ui-tabs-nav a,
+#sample-permalink a:hover {
 	color: #21759b;
 }
 
@@ -683,10 +684,6 @@
 	background-color: #ddd;
 }
 
-#editable-post-name {
-	background-color: #fffbcc;
-}
-
 #edit-slug-box strong,
 .tablenav .displaying-num,
 #submitted-on,
Index: wp-admin/css/colors-fresh.css
===================================================================
--- wp-admin/css/colors-fresh.css	(revision 21626)
+++ wp-admin/css/colors-fresh.css	(working copy)
@@ -630,7 +630,8 @@
 #media-items a.delete,
 #media-items a.delete-permanently,
 .plugins a.delete,
-.ui-tabs-nav a {
+.ui-tabs-nav a,
+#sample-permalink a:hover {
 	color: #21759b;
 }
 
@@ -674,10 +675,6 @@
 	background-color: #ddd;
 }
 
-#editable-post-name {
-	background-color: #fffbcc;
-}
-
 #edit-slug-box strong,
 .tablenav .displaying-num,
 #submitted-on,
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css	(revision 21626)
+++ wp-admin/css/wp-admin.css	(working copy)
@@ -2855,6 +2855,14 @@
 	padding: 0 10px;
 }
 
+#sample-permalink a {
+	text-decoration: none;
+}
+
+#sample-permalink a:hover {
+	text-decoration: underline;
+}
+
 #editable-post-name-full {
 	display: none;
 }
Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php	(revision 21626)
+++ wp-admin/includes/post.php	(working copy)
@@ -1092,11 +1092,11 @@
 	}
 
 	if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
+		if ( isset( $view_post ) )
+			$permalink = '<a href="' . $permalink . '" title="' . esc_attr( $view_post ) . '" target="_blank">' . $permalink . '</a>';
 		$return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";
 		if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
 			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
-		if ( isset($view_post) )
-			$return .= "<span id='view-post-btn'><a href='$permalink' class='button'>$view_post</a></span>\n";
 
 		$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
@@ -1117,16 +1117,16 @@
 		}
 	}
 
-	$post_name_html = '<span id="editable-post-name" title="' . $title . '">' . $post_name_abridged . '</span>';
+	$post_name_html = '<span id="editable-post-name">' . $post_name_abridged . '</span>';
 	$display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
 	$view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
+	if ( isset( $view_post ) )
+		$display_link = '<a href="' . $view_link . '" title="' . esc_attr( $view_post ) . '" target="_blank">' . $display_link . '</a>';
 	$return =  '<strong>' . __('Permalink:') . "</strong>\n";
 	$return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";
 	$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
 	$return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
 	$return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
-	if ( isset($view_post) )
-		$return .= "<span id='view-post-btn'><a href='$view_link' class='button'>$view_post</a></span>\n";
 
 	$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
Index: wp-admin/js/post.js
===================================================================
--- wp-admin/js/post.js	(revision 21626)
+++ wp-admin/js/post.js	(working copy)
@@ -611,7 +611,12 @@
 
 		makeSlugeditClickable = function() {
 			$('#editable-post-name').click(function() {
-				$('#edit-slug-buttons').children('.edit-slug').click();
+				var newSlugField = $('#new-post-slug');
+				
+				if (newSlugField.length != 0) {
+					newSlugField.focus();
+					return false;
+				}
 			});
 		}
 		makeSlugeditClickable();