diff --git a/manage_proj_edit_page.php b/manage_proj_edit_page.php
index ca090be48e..1fbdc67b2c 100644
--- a/manage_proj_edit_page.php
+++ b/manage_proj_edit_page.php
@@ -655,13 +655,16 @@
 			<input type="hidden" name="project_id" value="<?php echo $f_project_id ?>" />
 			<select name="field_id" class="input-sm">
 				<?php
-					$t_custom_fields = custom_field_get_ids();
+					$t_cf_defs = array();
+					foreach( custom_field_get_ids() as $t_cfid ) {
+						$t_cf_defs[] = custom_field_get_definition( $t_cfid );
+					}
+					$t_custom_fields = multi_sort( $t_cf_defs, 'name' );
 
-					foreach( $t_custom_fields as $t_field_id )
+					foreach( $t_custom_fields as $t_field )
 					{
-						if( !custom_field_is_linked( $t_field_id, $f_project_id ) ) {
-							$t_desc = custom_field_get_definition( $t_field_id );
-							echo "<option value=\"$t_field_id\">" . string_attribute( lang_get_defaulted( $t_desc['name'] ) ) . '</option>' ;
+						if( !custom_field_is_linked( $t_field['id'], $f_project_id ) ) {
+							echo '<option value="', $t_field['id'], '">', string_attribute( lang_get_defaulted( $t_field['name'] ) ), '</option>' ;
 						}
 					}
 				?>