         self.webViewController.webView.stopLoading()
         
         if let hvc: WebViewController = window?.contentViewController as? WebViewController {
-            hvc.updateTrackingAreas(false)
-        }
-        updateTrackingAreas(false)
+            hvc.setupTrackingAreas(false)
+        }
+        setupTrackingAreas(false)
     }
     
     // MARK:- Mouse events

        panel.ignoresMouseEvents = true
        
        //  Halt anything in progress
        (contentViewController as! WebViewController).webView.loadHTMLString("Yoink://", baseURL: nil)
        
        // Wind down all observations
        webView.removeObserver(delegate, forKeyPath: "estimatedProgress")

    var nullImage : NSImage?
    var trackingTag: NSTrackingRectTag?
    
    func setupTrackingAreas(_ establish : Bool) {
        if let tag = trackingTag {
            closeButton?.removeTrackingRect(tag)
        }
