1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/WidgetSet.java b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
index d7cc2df00d..ecbfb0ecc9 100644
--- a/src/com/vaadin/terminal/gwt/client/WidgetSet.java
+++ b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
@@ -5,6 +5,7 @@
 package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.core.client.GWT;
+import com.vaadin.terminal.gwt.client.communication.HasJavascriptConnectorHelper;
 import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 
 public class WidgetSet {
@@ -52,7 +53,12 @@ public class WidgetSet {
             /*
              * let the auto generated code instantiate this type
              */
-            return widgetMap.instantiate(classType);
+            ServerConnector connector = widgetMap.instantiate(classType);
+            if (connector instanceof HasJavascriptConnectorHelper) {
+                ((HasJavascriptConnectorHelper) connector)
+                        .getJavascriptConnectorHelper().setTag(tag);
+            }
+            return connector;
         }
     }