diff --git a/src/net/java/sip/communicator/service/gui/PluginComponentFactory.java b/src/net/java/sip/communicator/service/gui/PluginComponentFactory.java
index 2cb5379ab..0608b4e8d 100644
--- a/src/net/java/sip/communicator/service/gui/PluginComponentFactory.java
+++ b/src/net/java/sip/communicator/service/gui/PluginComponentFactory.java
@@ -139,6 +139,7 @@ public PluginComponent getPluginComponentInstance(Object parent)
         if(p == null)
         {
             p = getPluginInstance();
+            pluginInstances.put(parent, p);
         }
 
         return p;