--- old/src/java.desktop/share/classes/java/awt/TrayIcon.java	2016-08-05 14:18:29.676664000 +0530
+++ new/src/java.desktop/share/classes/java/awt/TrayIcon.java	2016-08-05 14:18:29.340664000 +0530
@@ -702,6 +702,9 @@
         synchronized (this) {
             p = peer;
             peer = null;
+            if (popup != null) {
+                popup.removeNotify();
+            }
         }
         if (p != null) {
             p.dispose();