diff --git a/html/pages/device/routing/bgp.inc.php b/html/pages/device/routing/bgp.inc.php
index 5b680d2d37..99ee0e9784 100644
--- a/html/pages/device/routing/bgp.inc.php
+++ b/html/pages/device/routing/bgp.inc.php
@@ -208,7 +208,12 @@ foreach (dbFetchRows("SELECT * FROM `bgpPeers` WHERE `device_id` = ? $extra_sql
     $graph_array_zoom['height'] = '150';
     $graph_array_zoom['width']  = '500';
     $overlib_link = "device/device=".$peer['device_id']."/tab=routing/proto=bgp/";
-    $peeraddresslink = "<span class=list-large>".overlib_link(null, $peer['bgpPeerIdentifier'], generate_graph_tag($graph_array_zoom), null)."</span>";
+
+    $link_array         = $graph_array;
+    $link_array['page'] = 'graphs';
+    unset($link_array['height'], $link_array['width'], $link_array['legend']);
+    $link = generate_url($link_array);
+    $peeraddresslink = "<span class=list-large>".overlib_link($link, $peer['bgpPeerIdentifier'], generate_graph_tag($graph_array_zoom), null)."</span>";
 
     echo '<tr bgcolor="'.$bg_colour.'"'.($peer['alert'] ? ' bordercolor="#cc0000"' : '').($peer['disabled'] ? ' bordercolor="#cccccc"' : '').'>
         ';