From 6e95f87e3b0c017c9be54a9bf27a77f398068ae6 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Fri, 15 Jun 2018 17:52:59 +0200
Subject: [PATCH] Transfer findbar data to torn-off tabs.

---
 application/palemoon/base/content/tabbrowser.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index 2db38e56ff..74bd044677 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -2277,6 +2277,17 @@
               this._swapBrowserDocShells(aOurTab, otherBrowser);
             }
 
+            // Handle findbar data (if any)
+            let otherFindBar = aOtherTab._findBar;
+            if (otherFindBar &&
+                otherFindBar.findMode == otherFindBar.FIND_NORMAL) {
+              let ourFindBar = this.getFindBar(aOurTab);
+              ourFindBar._findField.value = otherFindBar._findField.value;
+              if (!otherFindBar.hidden) {
+                ourFindBar.onFindCommand();
+              }
+            }
+
             // Finish tearing down the tab that's going away.
             remoteBrowser._endRemoveTab(aOtherTab);