Index: wp-admin/includes/class-wp-posts-list-table.php
===================================================================
--- wp-admin/includes/class-wp-posts-list-table.php	(revision 18990)
+++ wp-admin/includes/class-wp-posts-list-table.php	(working copy)
@@ -997,7 +997,8 @@
 
 	<?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) : 
 		$post_formats = get_theme_support( 'post-formats' );
-		if ( is_array( $post_formats[0] ) ) : ?>
+		$all_post_formats = get_post_format_strings();
+		if ( isset( $post_formats[0] ) && is_array( $post_formats[0] ) ) : ?>
 			<div class="inline-edit-group">
 				<label class="alignleft" for="post_format">
 				<span class="title"><?php _e( 'Post Format' ); ?></span>
@@ -1006,9 +1007,11 @@
 					<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
 				<?php endif; ?>
 					<option value="0"><?php _ex( 'Standard', 'Post format' ); ?></option>
-				<?php foreach ( $post_formats[0] as $format ): ?>
-					<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
-				<?php endforeach; ?>
+				<?php foreach ( $all_post_formats as $slug => $format ):
+					if ( $slug != 'standard' ) : ?>
+					<option value="<?php echo esc_attr( $slug ); ?>"<?php if ( ! in_array( $slug, $post_formats[0] ) ) echo ' class="unsupported"'; ?>><?php echo esc_html( $format ); ?></option>
+					<?php endif;
+				endforeach; ?>
 				</select></label>
 			</div>
 		<?php endif; ?>
Index: wp-admin/js/inline-edit-post.dev.js
===================================================================
--- wp-admin/js/inline-edit-post.dev.js	(revision 18990)
+++ wp-admin/js/inline-edit-post.dev.js	(working copy)
@@ -151,6 +151,13 @@
 			$('label.inline-edit-author', editRow).hide();
 		}
 
+		var cur_format = $('.post_format', rowData).text();
+		$('option.unsupported', editRow).each(function() {
+			var $this = $(this);
+			if ( $this.val() != cur_format )
+				$this.hide();
+		});
+
 		for ( var f = 0; f < fields.length; f++ ) {
 			$(':input[name="' + fields[f] + '"]', editRow).val( $('.'+fields[f], rowData).text() );
 		}