diff --git a/plugins/android/src/org/jetbrains/android/uipreview/RenderServiceFactory.java b/plugins/android/src/org/jetbrains/android/uipreview/RenderServiceFactory.java
index f9265610bc4f..088428977152 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/RenderServiceFactory.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/RenderServiceFactory.java
@@ -33,6 +33,7 @@ import com.android.sdklib.internal.project.ProjectProperties;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -81,6 +82,8 @@ public class RenderServiceFactory {
                                                  boolean isProjectTheme) {
     final Map<ResourceType, Map<String, ResourceValue>> configedProjectRes = projectResources.getConfiguredResources(config);
 
+    DumbService.getInstance(facet.getModule().getProject()).waitForSmartMode();
+
     final Collection<String> ids = ApplicationManager.getApplication().runReadAction(new Computable<Collection<String>>() {
       @Override
       public Collection<String> compute() {