diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index d165a7b75..0e0b296c5 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -6,6 +6,7 @@
  - fix [ 1489123 ] problem with graphing (Martin Kamerbeek / Procolix) 
  - Fixed a problem where anybody could see the complete list of admin console
    functions in the adminbar, even though they couldn't actually use them.
+ - fix [ 1489094 ] DataForm Record edit link wrong for list mode (Michelle LaMar)
 
 6.99.0
  - Added a workflow system.
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 0abeaaa34..6aaa2a0a0 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -328,7 +328,7 @@ sub getListTemplateVars {
 		$dloop->finish;
 		push(@recordLoop,{
 			"record.ipAddress"=>$record->{ipAddress},
-			"record.edit.url"=>$self->getUrl("func=view;entryId=".$record->{DataForm_entryId}),
+			"record.edit.url"=>$self->getFormUrl("func=view;entryId=".$record->{DataForm_entryId}),
 			"record.edit.icon"=>$self->session->icon->edit("func=view;entryId=".$record->{DataForm_entryId}, $self->getUrl),
 			"record.delete.url"=>$self->getUrl("func=deleteEntry;entryId=".$record->{DataForm_entryId}),
 			"record.delete.icon"=>$self->session->icon->delete("func=deleteEntry;entryId=".$record->{Asset_DataForm_entryId}, $self->getUrl, $i18n->get('Delete entry confirmation')),