Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php	(revision 17094)
+++ wp-admin/includes/media.php	(working copy)
@@ -1056,8 +1056,9 @@
 
 	$edit_post = sanitize_post($post, 'edit');
 
+	if ( substr($post->post_mime_type, 0, 5) == 'image' ) $default_link = get_option('image_default_link_type');
+	else $default_link = get_option('media_default_link_type');
 
-
 	$form_fields = array(
 		'post_title'   => array(
 			'label'      => __('Title'),
@@ -1076,7 +1077,7 @@
 		'url'          => array(
 			'label'      => __('Link URL'),
 			'input'      => 'html',
-			'html'       => image_link_input_fields($post, get_option('image_default_link_type')),
+			'html'       => image_link_input_fields($post, $default_link),
 			'helps'      => __('Enter a link URL or click above for presets.')
 		),
 		'menu_order'   => array(
Index: wp-admin/includes/schema.php
===================================================================
--- wp-admin/includes/schema.php	(revision 17094)
+++ wp-admin/includes/schema.php	(working copy)
@@ -321,6 +321,7 @@
 
 	// 3.1
 	'default_post_format' => 0,
+	'media_default_link_type' => 'file',
 	);
 
 	// 3.0 multisite