*** 700,709 **** --- 700,712 ---- void removeNotify() { TrayIconPeer p = null; synchronized (this) { p = peer; peer = null; + if (popup != null) { + popup.removeNotify(); + } } if (p != null) { p.dispose(); } }