diff --git a/frappe/custom/doctype/client_script/client_script.js b/frappe/custom/doctype/client_script/client_script.js
index a09e1e72b2..adf9ea8bc7 100644
--- a/frappe/custom/doctype/client_script/client_script.js
+++ b/frappe/custom/doctype/client_script/client_script.js
@@ -9,9 +9,13 @@ frappe.ui.form.on("Client Script", {
 	},
 	refresh(frm) {
 		if (frm.doc.dt && frm.doc.script) {
-			frm.add_custom_button(__("Go to {0}", [frm.doc.dt]), () =>
-				frappe.set_route("List", frm.doc.dt, "List")
-			);
+			frm.add_custom_button(__("Go to {0}", [frm.doc.dt]), () => {
+				if (frappe.model.is_single(frm.doc.dt)) {
+					frappe.set_route("Form", frm.doc.dt);
+				} else {
+					frappe.set_route("List", frm.doc.dt);
+				}
+			});
 		}
 
 		if (frm.doc.view == "Form") {