diff --git a/frappe/__init__.py b/frappe/__init__.py
index 9f38c7cbbc..278e4285a6 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1483,12 +1483,12 @@ def get_desk_link(doctype, name, show_title_with_name=False, open_in_new_tab=Fal
 	encoded_name = quote(name)
 
 	if show_title_with_name and name != title:
-		html = '<a href="/desk/Form/{doctype}/{encoded_name}"{target} style="font-weight: bold;">{doctype_local} {name}: {title_local}</a>'
+		html = '<a href="/desk/{doctype}/{encoded_name}"{target} style="font-weight: bold;">{doctype_local} {name}: {title_local}</a>'
 	else:
-		html = '<a href="/desk/Form/{doctype}/{encoded_name}"{target} style="font-weight: bold;">{doctype_local} {title_local}</a>'
+		html = '<a href="/desk/{doctype}/{encoded_name}"{target} style="font-weight: bold;">{doctype_local} {title_local}</a>'
 
 	return html.format(
-		doctype=doctype,
+		doctype=frappe.scrub(doctype),
 		name=name,
 		encoded_name=encoded_name,
 		doctype_local=_(doctype),