diff --git a/frappe/public/css/common.css b/frappe/public/css/common.css
index e07a6bb091..781a78d4d2 100644
--- a/frappe/public/css/common.css
+++ b/frappe/public/css/common.css
@@ -94,6 +94,8 @@ kbd {
   min-width: 200px;
   padding: 0px;
   font-size: 12px;
+  max-height: 400px;
+  overflow: auto;
   border-radius: 0px 0px 4px 4px;
 }
 .dropdown-menu .dropdown-header {
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index 4bf3cb0275..cd95c71021 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -94,6 +94,8 @@ kbd {
   min-width: 200px;
   padding: 0px;
   font-size: 12px;
+  max-height: 400px;
+  overflow: auto;
   border-radius: 0px 0px 4px 4px;
 }
 .dropdown-menu .dropdown-header {
diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css
index 968b6fc766..5736704e5d 100644
--- a/frappe/public/css/website.css
+++ b/frappe/public/css/website.css
@@ -94,6 +94,8 @@ kbd {
   min-width: 200px;
   padding: 0px;
   font-size: 12px;
+  max-height: 400px;
+  overflow: auto;
   border-radius: 0px 0px 4px 4px;
 }
 .dropdown-menu .dropdown-header {
diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js
index fb99ea292d..7d5d234b16 100644
--- a/frappe/public/js/frappe/views/gantt/gantt_view.js
+++ b/frappe/public/js/frappe/views/gantt/gantt_view.js
@@ -69,17 +69,18 @@ frappe.views.GanttView = frappe.views.ListRenderer.extend({
 			},
 			custom_popup_html: function(task) {
 				var item = me.get_item(task.id);
-				var list_item_subject = frappe.render_template('list_item_subject', item);
-				var html = '<div class="heading">'+
-					list_item_subject +'</div>';
 
-				// custom html in {doctype}_list.js
+				var html =
+					`<h5>${task.name}</h5>
+					<p>${task._start.format('MMM D')} - ${task._end.format('MMM D')}</p>`;
+
+				// custom html in doctype settings
 				var custom = me.settings.gantt_custom_popup_html;
-				if(custom) {
-					html = custom(item, html);
+				if(custom && $.isFunction(custom)) {
+					var ganttobj = task;
+					html = custom(ganttobj, item);
 				}
-
-				return '<div class="details-container">'+ html +'</div>';
+				return '<div class="details-container">' + html + '</div>';
 			}
 		});
 		this.render_dropdown();
diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js
index 511a334920..11143501c2 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_board.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_board.js
@@ -531,7 +531,8 @@ frappe.provide("frappe.views");
 
 		function bind_edit_card() {
 			self.$card.find('.kanban-card.content').on('click', function () {
-				setup_edit_card();
+				frappe.set_route('Form', card.doctype, card.name);
+				// setup_edit_card();
 			});
 		}
 
diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less
index 7fe8b195cd..3328d10ef0 100644
--- a/frappe/public/less/common.less
+++ b/frappe/public/less/common.less
@@ -107,6 +107,8 @@ kbd {
 	min-width: 200px;
 	padding: 0px;
 	font-size: @text-medium;
+	max-height: 400px;
+	overflow: auto;
 
 	// only rounded bottoms
 	border-radius: 0px 0px 4px 4px;