diff --git a/src/js/test/test-logic.js b/src/js/test/test-logic.js
index 3c3db01e2..79cd499d8 100644
--- a/src/js/test/test-logic.js
+++ b/src/js/test/test-logic.js
@@ -2014,7 +2014,7 @@ export function finish(difficultyFailed = false) {
       $("#words").empty();
       ChartController.result.resize();
 
-      if (Config.burstHeatmap) {
+      if (Config.alwaysShowWordsHistory && Config.burstHeatmap) {
         TestUI.applyBurstHeatmap();
       }
       $("#testModesNotice").addClass("hidden");
diff --git a/src/js/test/test-ui.js b/src/js/test/test-ui.js
index 111458fd4..6dfb5abdb 100644
--- a/src/js/test/test-ui.js
+++ b/src/js/test/test-ui.js
@@ -16,6 +16,7 @@ import * as PractiseWords from "./practise-words";
 import * as Replay from "./replay";
 import * as TestStats from "./test-stats";
 import * as Misc from "./misc";
+import * as TestUI from "./test-ui";
 
 export let currentWordElementIndex = 0;
 export let resultVisible = false;
@@ -770,12 +771,22 @@ export function toggleResultWords() {
           `<div class="preloader"><i class="fas fa-fw fa-spin fa-circle-notch"></i></div>`
         );
         loadWordsHistory().then(() => {
+          if (Config.burstHeatmap) {
+            TestUI.applyBurstHeatmap();
+          }
           $("#resultWordsHistory")
             .removeClass("hidden")
             .css("display", "none")
-            .slideDown(250);
+            .slideDown(250, () => {
+              if (Config.burstHeatmap) {
+                TestUI.applyBurstHeatmap();
+              }
+            });
         });
       } else {
+        if (Config.burstHeatmap) {
+          TestUI.applyBurstHeatmap();
+        }
         $("#resultWordsHistory")
           .removeClass("hidden")
           .css("display", "none")