diff --git a/main.js b/main.js
index 826c41cc..3e73f943 100644
--- a/main.js
+++ b/main.js
@@ -580,6 +580,10 @@ exports.main = function (options, callbacks) {
 };
 
 exports.onUnload = function (reason) {
+  for (let window of browserWindows) {
+    viewFor(window).VerticalTabs.clearFind();
+  }
+
   // If the app is shutting down, skip the rest
   if (reason === 'shutdown') {
     return;
diff --git a/verticaltabs.js b/verticaltabs.js
index 0ce3f966..42a60a9a 100644
--- a/verticaltabs.js
+++ b/verticaltabs.js
@@ -1201,7 +1201,6 @@ VerticalTabs.prototype = {
     if (tourPanel) {
       this.document.getElementById('mainPopupSet').removeChild(tourPanel);
     }
-    this.clearFind();
     let urlbar = this.document.getElementById('urlbar');
     let url = urlbar.value;
     let tabs = this.document.getElementById('tabbrowser-tabs');