diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index f5b0e3f377a..7a4968ebe6a 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -7,6 +7,7 @@
 			<div class="ui container ten wide column">
 				{{if .EnableHeatmap}}
 					{{template "user/dashboard/heatmap" .}}
+					<div class="ui divider"></div>
 				{{end}}
 				{{template "user/dashboard/feeds" .}}
 			</div>
diff --git a/templates/user/dashboard/heatmap.tmpl b/templates/user/dashboard/heatmap.tmpl
index e1a3ca7d3a8..626c70dd8db 100644
--- a/templates/user/dashboard/heatmap.tmpl
+++ b/templates/user/dashboard/heatmap.tmpl
@@ -4,5 +4,4 @@
 			<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div>
 		</div>
 	</activity-heatmap>
-	<div class="ui divider"></div>
 </div>
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index f3cac7befb9..e07b4b0dd86 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -104,16 +104,10 @@
 				</div>
 
 				{{if eq .TabName "activity"}}
-					{{if .EnableHeatmap}}
-						<div id="user-heatmap" style="padding-right: 40px">
-							<activity-heatmap :locale="locale" :suburl="suburl" :user="heatmapUser">
-								<div slot="loading">
-									<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div>
-								</div>
-							</activity-heatmap>
-						</div>
-						<div class="ui divider"></div>
-					{{end}}
+				{{if .EnableHeatmap}}
+					{{template "user/dashboard/heatmap" .}}
+					<div class="ui divider"></div>
+				{{end}}
 					<div class="feeds">
 						{{template "user/dashboard/feeds" .}}
 					</div>
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index 3c46748816f..ec241b64fae 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -7,7 +7,6 @@
             {{ totalContributions }} total contributions in the last 12 months
         </h4>
         <calendar-heatmap v-show="!isLoading" :locale="locale" :no-data-text="locale.no_contributions" :tooltip-unit="locale.contributions" :end-date="endDate" :values="values" :range-color="colorRange"/>
-        <div class="ui divider"></div>
     </div>
 </template>