diff --git wp-admin/js/post-formats.js wp-admin/js/post-formats.js
index 4c9e0ec..00ca966 100644
--- wp-admin/js/post-formats.js
+++ wp-admin/js/post-formats.js
@@ -151,7 +151,7 @@ window.wp = window.wp || {};
 					// show one preview at a time
 					mediaPreview(attachment);
 				} else {
-					html = wp.media.string.image({}, attachment);
+					html = wp.media.string.image({size: 'full'}, attachment);
 					// set the hidden input's value
 					$field.val(html);
 					$('#image-preview').remove();
diff --git wp-includes/media.php wp-includes/media.php
index bd52867..81c3c4b 100644
--- wp-includes/media.php
+++ wp-includes/media.php
@@ -2416,7 +2416,10 @@ function get_the_post_format_image( $attached_size = 'full', &$post = null ) {
 		else
 			$image = $meta['image'];
 
-		$post->format_content = sprintf( $link_fmt, $image );
+		if ( false === strpos( $image, '<a ' ) )
+			$post->format_content = sprintf( $link_fmt, $image );
+		else
+			$post->format_content = $image;
 		return $post->format_content;
 	}
 
@@ -2508,4 +2511,4 @@ function attachment_url_to_postid( $url ) {
 	}
 
 	return 0;
-}
\ No newline at end of file
+}