diff --git a/src/backend/agent.js b/src/backend/agent.js
index f1f7532e1f..74676d44b9 100644
--- a/src/backend/agent.js
+++ b/src/backend/agent.js
@@ -402,6 +402,8 @@ export default class Agent extends EventEmitter {
   };
 
   shutdown = () => {
+    // Clean up the overlay if visible, and associated events.
+    this.stopInspectingDOM();
     this.emit('shutdown');
   };