--- old/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java	2016-03-30 17:39:55.000000000 +0530
+++ new/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java	2016-03-30 17:39:54.000000000 +0530
@@ -99,14 +99,19 @@
 
     //invocation from the AWTTrayIcon.m
     public long getPopupMenuModel(){
-        if(popup == null) {
-            PopupMenu popupMenu = target.getPopupMenu();
-            if (popupMenu != null) {
-                popup = popupMenu;
-            } else {
-                return 0L;
+        if(popup != null) {
+            PopupMenu newPopup = target.getPopupMenu();
+            if (popup != newPopup) {
+            	if (newPopup != null) {
+                    popup = newPopup;
+            	} else {
+                    return 0L;
+            	}
             }
+        } else {
+            return 0L;
         }
+
         return checkAndCreatePopupPeer().getModel();
     }