diff --git a/msp/msp/doctype/ip_network/ip_network.js b/msp/msp/doctype/ip_network/ip_network.js
index 60cd170..601c760 100644
--- a/msp/msp/doctype/ip_network/ip_network.js
+++ b/msp/msp/doctype/ip_network/ip_network.js
@@ -14,11 +14,6 @@ frappe.ui.form.on('IP Network', {
 				}
 			})
 		})
-	},
-	onload_post_render(frm) {
-		getUsedIpsInNetwork(frm);
-	},
-	after_save(frm) {
 		getUsedIpsInNetwork(frm);
 	}
 });
@@ -32,8 +27,20 @@ function getUsedIpsInNetwork(frm) {
 			response?.message?.forEach((element) => {
 				tableBody += `
 						<tr>
-							<td style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left;">${element?.ip_address ?? "-"}</td>
-							<td style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left;">${element?.title ?? "-"}</td>
+							<td
+								style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left; ${element?.ip_address_name ? 'cursor: pointer;' : ''}"
+								data-doctype-name="${element?.ip_address_name ?? ''}"
+								data-doctype-type="IP Address"
+							>
+								${element?.ip_address ?? "-"}
+							</td>
+							<td
+								style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left; ${element?.ip_address_name ? 'cursor: pointer;' : ''}"
+								data-doctype-name="${element?.it_object_name ?? ''}"
+								data-doctype-type="IT Object"
+							>
+								${element?.title ?? "-"}
+							</td>
 							<td style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left;">${element?.type ?? "-"}</td>
 						</tr>
 					`;
@@ -55,5 +62,16 @@ function getUsedIpsInNetwork(frm) {
 				` : 'No IPs used for this network';
 
 			container.innerHTML = table;
+
+			document.querySelectorAll('[data-doctype-name]').forEach(element => {
+				element.addEventListener('click', (event) => {
+					event.preventDefault();
+					if (event.target.dataset?.doctypeName === '') {
+						return;
+					}
+
+					frappe.set_route('Form', event.target.dataset?.doctypeType, event.target.dataset?.doctypeName);
+				});
+			});
 		})
 }
diff --git a/msp/msp/doctype/ip_network/ip_network.py b/msp/msp/doctype/ip_network/ip_network.py
index acbdb3d..ba01498 100644
--- a/msp/msp/doctype/ip_network/ip_network.py
+++ b/msp/msp/doctype/ip_network/ip_network.py
@@ -14,7 +14,9 @@ class IPNetwork(Document):
 		result = []
 		result = frappe.db.sql("""
 			SELECT
+				ipa.name as ip_address_name,
 				ipa.ip_address,
+				ito.name as it_object_name,
 				ito.title,
 				ito.type
 			FROM `tabIP Address` ipa