diff --git wp-admin/edit-form-advanced.php wp-admin/edit-form-advanced.php
index ad44a52..7689090 100644
--- wp-admin/edit-form-advanced.php
+++ wp-admin/edit-form-advanced.php
@@ -138,7 +138,13 @@ if ( post_type_supports( $post_type, 'post-formats' ) && apply_filters( 'show_po
 	$post_format_set_class = 'post-format-set';
 
 	if ( ! $post_format ) {
-		$post_format = 'standard';
+		if ( ! empty( $_GET['format'] ) && in_array( $_GET['format'], get_post_format_slugs() ) )
+			$post_format = $_GET['format'];
+		else
+			unset( $_GET['format'] );
+
+		if ( ! $post_format )
+			$post_format = 'standard';
 		if ( 'auto-draft' == $post->post_status )
 			$post_format_set_class = '';
 	}