diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css
index c83c71833a..f03f8d987d 100644
--- a/frappe/public/css/form.css
+++ b/frappe/public/css/form.css
@@ -98,6 +98,10 @@
 .form-dashboard-section:last-child {
   border-bottom: none;
 }
+.form-heatmap .heatmap {
+  display: flex;
+  justify-content: center;
+}
 .form-heatmap .heatmap-message {
   margin-top: 10px;
 }
diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js
index c7ce98e537..23e13ac823 100644
--- a/frappe/public/js/frappe/form/dashboard.js
+++ b/frappe/public/js/frappe/form/dashboard.js
@@ -338,7 +338,7 @@ frappe.ui.form.Dashboard = Class.extend({
 				parent: this.heatmap_area.find("#heatmap-" + frappe.model.scrub(this.frm.doctype)),
 				height: 100,
 				start: new Date(moment().subtract(1, 'year').toDate()),
-				discrete_domains: 1
+				discrete_domains: 0
 			});
 
 			// center the heatmap
diff --git a/frappe/public/js/frappe/form/templates/form_dashboard.html b/frappe/public/js/frappe/form/templates/form_dashboard.html
index c41929df73..110cff3a7c 100644
--- a/frappe/public/js/frappe/form/templates/form_dashboard.html
+++ b/frappe/public/js/frappe/form/templates/form_dashboard.html
@@ -2,7 +2,7 @@
 	<div class="progress-area hidden form-dashboard-section">
 	</div>
 	<div class="form-heatmap hidden form-dashboard-section">
-		<div id="heatmap-{{ frappe.model.scrub(frm.doctype) }}"></div>
+		<div id="heatmap-{{ frappe.model.scrub(frm.doctype) }}" class="heatmap"></div>
 		<div class="text-muted small heatmap-message hidden"></div>
 	</div>
 	<div class="form-graph form-dashboard-section hidden"></div>
diff --git a/frappe/public/js/frappe/ui/graphs.js b/frappe/public/js/frappe/ui/graphs.js
index 041928cebe..b79bbc9069 100644
--- a/frappe/public/js/frappe/ui/graphs.js
+++ b/frappe/public/js/frappe/ui/graphs.js
@@ -649,7 +649,7 @@ frappe.ui.HeatMap = class HeatMap extends frappe.ui.Graph {
 	}
 
 	set_width() {
-		this.base_width = (this.no_of_cols + 14) * 12;
+		this.base_width = (this.no_of_cols) * 12;
 	}
 
 	setup_components() {
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 854fa53f66..afec19cd44 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -136,6 +136,11 @@
 
 .form-heatmap {
 
+	.heatmap {
+		display: flex;
+		justify-content: center;
+	}
+
 	.heatmap-message {
 		margin-top: 10px;
 	}