diff --git a/modules/ui/panels/history.js b/modules/ui/panels/history.js
index e8e8fcdcf..249a2068e 100644
--- a/modules/ui/panels/history.js
+++ b/modules/ui/panels/history.js
@@ -227,11 +227,16 @@ export function uiPanelHistory(context) {
             .on('drawn.info-history', function() {
                 selection.call(redraw);
             });
+
+        context
+            .on('enter.info-history', function() {
+                selection.call(redraw);
+            });
     };
 
     panel.off = function() {
-        context.map()
-            .on('drawn.info-history', null);
+        context.map().on('drawn.info-history', null);
+        context.on('enter.info-history', null);
     };
 
     panel.id = 'history';
diff --git a/modules/ui/panels/measurement.js b/modules/ui/panels/measurement.js
index b5400950b..aabdf7641 100644
--- a/modules/ui/panels/measurement.js
+++ b/modules/ui/panels/measurement.js
@@ -193,11 +193,16 @@ export function uiPanelMeasurement(context) {
             .on('drawn.info-measurement', function() {
                 selection.call(redraw);
             });
+
+        context
+            .on('enter.info-measurement', function() {
+                selection.call(redraw);
+            });
     };
 
     panel.off = function() {
-        context.map()
-            .on('drawn.info-measurement', null);
+        context.map().on('drawn.info-measurement', null);
+        context.on('enter.info-measurement', null);
     };
 
     panel.id = 'measurement';