diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index ccdd832e86..402965e50c 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -218,8 +218,11 @@ if ( ! is_file( $real_file ) ) {
 		<strong><label for="plugin"><?php _e( 'Select plugin to edit:' ); ?> </label></strong>
 		<select name="plugin" id="plugin">
 <?php
+$p_active = '';
+$p_notactive = '';
 foreach ( $plugins as $plugin_key => $a_plugin ) {
 	$plugin_name = $a_plugin['Name'];
+	$active_p = is_plugin_active( $plugin_key );
 	if ( $plugin_key == $plugin ) {
 		$selected = " selected='selected'";
 	} else {
@@ -227,8 +230,14 @@ foreach ( $plugins as $plugin_key => $a_plugin ) {
 	}
 	$plugin_name = esc_attr( $plugin_name );
 	$plugin_key  = esc_attr( $plugin_key );
-	echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";
+	if ( $active_p ) {
+		$p_active .= "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";
+	} else {
+		$p_notactive .= "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";
+	}
 }
+echo $p_active ? sprintf( "\n\t<option disabled value=\"active-plugins\">%s</option>", __( 'Active' ) ) . $p_active : '';
+echo $p_notactive ? sprintf( "\n\t<option disabled value=\"not-active-plugins\">%s</option>", __( 'Not Active' ) ) . $p_notactive : '';
 ?>
 		</select>
 		<?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>