diff --git a/src/EFTools/EntityDesignPackage/GeneratedCode/Package.cs b/src/EFTools/EntityDesignPackage/GeneratedCode/Package.cs
index ae16c4df..59f394be 100644
--- a/src/EFTools/EntityDesignPackage/GeneratedCode/Package.cs
+++ b/src/EFTools/EntityDesignPackage/GeneratedCode/Package.cs
@@ -48,7 +48,7 @@ namespace Microsoft.Data.Entity.Design.Package
 					"vs.edm.common.inheritancerelationships", 
 					"@InheritanceToolToolboxBitmap;Microsoft.Data.Entity.Design.EntityDesigner.dll", 
 					0xff00ff)]
-	[VSShell::ProvideEditorFactory(typeof(MicrosoftDataEntityDesignEditorFactory), 103, TrustLevel = VSShellInterop::__VSEDITORTRUSTLEVEL.ETL_AlwaysTrusted)]
+	[VSShell::ProvideEditorFactory(typeof(MicrosoftDataEntityDesignEditorFactory), 103, deferUntilIntellisenseIsReady: false, TrustLevel = VSShellInterop::__VSEDITORTRUSTLEVEL.ETL_AlwaysTrusted)]
 	[VSShell::ProvideEditorExtension(typeof(MicrosoftDataEntityDesignEditorFactory), "." + Constants.DesignerFileExtension, 50)]
 	[DslShell::ProvideRelatedFile("." + Constants.DesignerFileExtension, Constants.DefaultDiagramExtension,
 		ProjectSystem = DslShell::ProvideRelatedFileAttribute.CSharpProjectGuid,
diff --git a/src/EFTools/EntityDesignPackage/PkgDefData/Microsoft.Data.Entity.Design.Package.pkgdef b/src/EFTools/EntityDesignPackage/PkgDefData/Microsoft.Data.Entity.Design.Package.pkgdef
index 98546916..7bd43a1f 100644
--- a/src/EFTools/EntityDesignPackage/PkgDefData/Microsoft.Data.Entity.Design.Package.pkgdef
+++ b/src/EFTools/EntityDesignPackage/PkgDefData/Microsoft.Data.Entity.Design.Package.pkgdef
@@ -9,6 +9,7 @@
 "EditorTrustLevel"=dword:00000001
 "Package"="{8889e051-b7f9-4781-bb33-2a36a9bdb3a5}"
 "CommonPhysicalViewAttributes"=dword:00000002
+"DeferUntilIntellisenseIsReady"=dword:00000000
 
 [$RootKey$\Editors\{c99aea30-8e36-4515-b76f-496f5a48a6aa}\Extensions]
 "edmx"=dword:0000003d