diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index db93e1755..fa46f70e0 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -60,6 +60,17 @@ function xfn_check($class, $value = '', $deprecated = '') {
 </div>
 
 <div class="submitbox" id="submitlink">
+
+<div id="previewview">
+<?php if ( !empty($link_id) ) { ?>
+<a href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
+<?php } ?>
+</div>
+
+<div class="inside">
+<p><label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label></p>
+</div>
+
 <p class="submit">
 <input type="submit" name="save" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
 </p>
@@ -119,18 +130,6 @@ function xfn_check($class, $value = '', $deprecated = '') {
 </div>
 </div>
 
-<div id="linkvisiblediv" class="postbox <?php echo postbox_classes('linkvisiblediv', 'link'); ?>">
-<h3><?php _e('Visible') ?></h3>
-<div class="inside">
-<label for="link_visible_yes" class="selectit">
-<input id="link_visible_yes" type="radio" name="link_visible" <?php if ($link->link_visible == 'Y') echo "checked='checked'"; ?> value="Y" />
-<?php _e('Yes') ?></label>
-<label for="link_visible_no" class="selectit">
-<input id="link_visible_no" type="radio" name="link_visible" <?php if ($link->link_visible == 'N') echo "checked='checked'"; ?> value="N" />
-<?php _e('No') ?></label>
-</div>
-</div>
-
 <div id="linkxfndiv" class="postbox <?php echo postbox_classes('linkxfndiv', 'link'); ?>">
 <h3><?php _e('Link Relationship (XFN)') ?></h3>
 <div class="inside">
diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php
index 7528da010..af2efa59c 100644
--- a/wp-admin/includes/bookmark.php
+++ b/wp-admin/includes/bookmark.php
@@ -13,6 +13,8 @@ function edit_link( $link_id = '' ) {
 	$_POST['link_name'] = wp_specialchars( $_POST['link_name'] );
 	$_POST['link_image'] = wp_specialchars( $_POST['link_image'] );
 	$_POST['link_rss'] = clean_url($_POST['link_rss']);
+	if ( 'N' != $_POST['link_visible'] )
+		$_POST['link_visible'] = 'Y';
 
 	if ( !empty( $link_id ) ) {
 		$_POST['link_id'] = $link_id;