diff --git a/frappe/public/js/frappe/list/list_view_select.js b/frappe/public/js/frappe/list/list_view_select.js
index 5d71f9a07f..58aa103ffb 100644
--- a/frappe/public/js/frappe/list/list_view_select.js
+++ b/frappe/public/js/frappe/list/list_view_select.js
@@ -75,7 +75,9 @@ frappe.views.ListViewSelect = class ListViewSelect {
 				action: () => this.set_route("dashboard"),
 			},
 			Calendar: {
-				condition: frappe.views.calendar[this.doctype],
+				condition:
+					frappe.views.calendar[this.doctype] ||
+					frappe.get_meta(this.doctype).is_calendar_and_gantt,
 				action: () => this.set_route("calendar", "default"),
 				current_view_handler: () => {
 					this.get_calendars().then((calendars) => {
@@ -84,7 +86,9 @@ frappe.views.ListViewSelect = class ListViewSelect {
 				},
 			},
 			Gantt: {
-				condition: frappe.views.calendar[this.doctype],
+				condition:
+					frappe.views.calendar[this.doctype] ||
+					frappe.get_meta(this.doctype).is_calendar_and_gantt,
 				action: () => this.set_route("gantt"),
 			},
 			Inbox: {
diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js
index 89c3b2a041..b653693d94 100644
--- a/frappe/public/js/frappe/views/gantt/gantt_view.js
+++ b/frappe/public/js/frappe/views/gantt/gantt_view.js
@@ -1,5 +1,12 @@
 frappe.provide("frappe.views");
 
+const DEFAULT_FIELD_MAP = {
+	start: "start",
+	end: "end",
+	id: "name",
+	progress: "progress",
+};
+
 frappe.views.GanttView = class GanttView extends frappe.views.ListView {
 	get view_name() {
 		return "Gantt";
@@ -9,6 +16,10 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView {
 		return super.setup_defaults().then(() => {
 			this.page_title = this.page_title + " " + __("Gantt");
 			this.calendar_settings = frappe.views.calendar[this.doctype] || {};
+			this.calendar_settings.field_map = {
+				...DEFAULT_FIELD_MAP,
+				...(this.calendar_settings.field_map || {}),
+			};
 
 			if (typeof this.calendar_settings.gantt == "object") {
 				Object.assign(this.calendar_settings, this.calendar_settings.gantt);
@@ -35,32 +46,34 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView {
 	prepare_tasks() {
 		var me = this;
 		var meta = this.meta;
-		var field_map = this.calendar_settings.field_map;
+		var field_map = this.calendar_settings.field_map || DEFAULT_FIELD_MAP;
 
 		this.tasks = this.data.map(function (item) {
 			// set progress
 			var progress = 0;
-			if (field_map.progress && $.isFunction(field_map.progress)) {
+			if (typeof field_map.progress === "function") {
 				progress = field_map.progress(item);
 			} else if (field_map.progress) {
 				progress = item[field_map.progress];
 			}
 
 			// title
-			var label;
-			if (meta.title_field) {
+			let label;
+			if (field_map.title) {
+				label = item[field_map.title];
+			} else if (meta.title_field) {
 				label = item.progress
 					? __("{0} ({1}) - {2}%", [item[meta.title_field], item.name, item.progress])
 					: __("{0} ({1})", [item[meta.title_field], item.name]);
 			} else {
-				label = item[field_map.title];
+				label = item["name"];
 			}
 
-			var r = {
+			const r = {
 				start: item[field_map.start],
-				end: item[field_map.end],
+				end: item[field_map.end] || item[field_map.start],
 				name: label,
-				id: item[field_map.id || "name"],
+				id: item[field_map.id],
 				doctype: me.doctype,
 				progress: progress,
 				dependencies: item.depends_on_tasks || "",
@@ -118,7 +131,7 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView {
 				if (!me.can_write) return;
 				var progress_fieldname = "progress";
 
-				if ($.isFunction(field_map.progress)) {
+				if (typeof field_map.progress === "function") {
 					progress_fieldname = null;
 				} else if (field_map.progress) {
 					progress_fieldname = field_map.progress;