--- links_admin.module	2009-01-11 21:01:38.000000000 +0000
+++ links_admin.module	2009-01-11 22:56:10.000000000 +0000
@@ -1023,9 +1023,9 @@ function theme_links_admin_list_form($fo
             }
             break;
           case 'url':
-            $rows[$i][$j] .= l(t('Open link'), 'links/goto/'.$lid);
+            $rows[$i][$j] .= l(t('Open link'), links_format_goto_url(0,$lid));
             $rows[$i][$j] .= ' | ';
-            $rows[$i][$j] .= l(t('Open link in new window'), 'links/goto/'.$lid, array('attributes'=>array('target'=>'_blank')));
+            $rows[$i][$j] .= l(t('Open link in new window'), links_format_goto_url(0,$lid), array('attributes'=>array('target'=>'_blank')));
             break;
         }
         $j++;