src/java.desktop/share/classes/java/awt/TrayIcon.java

@@ -700,10 +700,13 @@
     void removeNotify() {
         TrayIconPeer p = null;
         synchronized (this) {
             p = peer;
             peer = null;
+            if (popup != null) {
+                popup.removeNotify();
+            }
         }
         if (p != null) {
             p.dispose();
         }
     }