diff --git a/js/ui/panel.js b/js/ui/panel.js
index da1079c79..eb1e4a378 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -903,7 +903,8 @@ Panel.prototype = {
     },
 
     _onTrayIconRemoved: function(o, icon) {
-        this._trayBox.remove_actor(icon);
+        if (icon.get_parent() != null)
+            this._trayBox.remove_actor(icon);
     },
 
     _addRipple : function(delay, time, startScale, startOpacity, finalScale, finalOpacity) {