diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java b/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java
index 6cb9d0f20d53..813a3d6592f8 100644
--- a/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java
+++ b/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java
@@ -479,9 +479,13 @@ public class AndroidFacet extends Facet<AndroidFacetConfiguration> {
 
             final Sdk newSdk = ModuleRootManager.getInstance(getModule()).getSdk();
             if (newSdk != null && newSdk.getSdkType() instanceof AndroidSdkType && !newSdk.equals(myPrevSdk)) {
-              myPrevSdk = newSdk;
               androidPlatformChanged();
+
+              synchronized (myDirtyModes) {
+                myDirtyModes.addAll(Arrays.asList(AndroidAutogeneratorMode.values()));
+              }
             }
+            myPrevSdk = newSdk;
 
             PsiDocumentManager.getInstance(getModule().getProject()).commitAllDocuments();