summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/ui/UIConnector.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index c88fd23eca..d6f14bf158 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -494,7 +494,11 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
// the user
root.getElement().setInnerHTML("");
+ // Activate the initial theme by only adding the class name. Not calling
+ // activateTheme here as it will also cause a full layout and updates to
+ // the overlay container which has not yet been created at this point
activeTheme = applicationConnection.getConfiguration().getThemeName();
+ root.addStyleName(activeTheme);
root.add(getWidget());