diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 0509ea9af7..31beabc56a 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -712,9 +712,10 @@ def validate_fields(meta):
 		if d.fieldtype == "Currency" and cint(d.width) < 100:
 			frappe.throw(_("Max width for type Currency is 100px in row {0}").format(d.idx))
 
-	def check_in_list_view(d):
+	def check_in_list_view(is_table, d):
 		if d.in_list_view and (d.fieldtype in not_allowed_in_list_view):
-			frappe.throw(_("'In List View' not allowed for type {0} in row {1}").format(d.fieldtype, d.idx))
+			property_label = 'In Grid View' if is_table else 'In List View'
+			frappe.throw(_("'{0}' not allowed for type {1} in row {2}").format(property_label, d.fieldtype, d.idx))
 
 	def check_in_global_search(d):
 		if d.in_global_search and d.fieldtype in no_value_fields:
@@ -929,7 +930,7 @@ def validate_fields(meta):
 		check_link_table_options(meta.get("name"), d)
 		check_dynamic_link_options(d)
 		check_hidden_and_mandatory(meta.get("name"), d)
-		check_in_list_view(d)
+		check_in_list_view(meta.get('istable'), d)
 		check_in_global_search(d)
 		check_illegal_default(d)
 		check_unique_and_text(meta.get("name"), d)