diff --git a/lib/minimap-find-and-replace.js b/lib/minimap-find-and-replace.js
index 1001528..ec5d962 100644
--- a/lib/minimap-find-and-replace.js
+++ b/lib/minimap-find-and-replace.js
@@ -71,10 +71,10 @@ module.exports = {
 		const [fnrPanel] = atom.workspace.getBottomPanels().filter(panel => panel.element.firstChild.classList.contains('find-and-replace'))
 
 		if (fnrPanel) {
-			this.changeVisible(true)
-			fnrPanel.onDidChangeVisible((visible) => {
+			this.changeVisible(fnrPanel.isVisible())
+			this.subscriptions.add(fnrPanel.onDidChangeVisible((visible) => {
 				this.changeVisible(visible)
-			})
+			}))
 		} else {
 			if (retry < 10) {
 				setTimeout(() => this.setOnChangeVisibility(retry + 1), 100)