diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 4b9733681..0276d8ceb 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,7 @@
 7.5.14
  - fixed: Rich editor collateral image uploader is broken
  - fixed: ems 2.0: tickets get created as badges also
+ - shortcut overrides display titles instead of field names
  - fixed: Non-admin users can now add Gallery assets
  - fixed: Thingy Data now retains File and Images if they aren't explicitly deleted
  - fixed: Rich Editor no longer makes other form controls show up as code in Safari 3
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 971276193..839eed230 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -369,8 +369,9 @@ sub getOverridesList {
 	foreach my $definition (@{$shortcut->definition($self->session)}) {
 		foreach my $prop (keys %{$definition->{properties}}) {
 			next if $definition->{properties}{$prop}{fieldType} eq 'hidden';
+            next if $definition->{properties}{$prop}{label} eq '';
 			$output .= '<tr>';
-			$output .= '<td class="tableData"><a href="'.$self->getUrl('func=editOverride;fieldName='.$prop).'">'.$prop.'</a></td>';
+            $output .= '<td class="tableData">'.$definition->{properties}{$prop}{label}.'</td>';
 			$output .= '<td class="tableData">';
 			$output .= $self->session->icon->edit('func=editOverride;fieldName='.$prop,$self->get("url"));
 			$output .= $self->session->icon->delete('func=deleteOverride;fieldName='.$prop,$self->get("url")) if exists $overrides{overrides}{$prop};