Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 24026)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -139,6 +139,9 @@
 
 	if ( ! $post_format ) {
 		$post_format = 'standard';
+		if ( ! empty( $_REQUEST['post_format'] ) && in_array( $_REQUEST['post_format'], get_post_format_slugs() ) )
+			$post_format = $_REQUEST['post_format'];
+
 		if ( 'auto-draft' == $post->post_status )
 			$post_format_set_class = '';
 	}
