diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
index c635ee46b63b6..620fe0bd251e9 100644
--- a/lib/IDE/CodeCompletion.cpp
+++ b/lib/IDE/CodeCompletion.cpp
@@ -901,7 +901,7 @@ static void addKeywordsAfterReturn(CodeCompletionResultSink &Sink, DeclContext *
       // Note that `TypeContext` must stay alive for the duration of
       // `~CodeCodeCompletionResultBuilder()`.
       ExpectedTypeContext TypeContext;
-      TypeContext.setPossibleTypes({resultType});
+      TypeContext.setPossibleTypes({DC->mapTypeIntoContext(resultType)});
 
       CodeCompletionResultBuilder Builder(Sink, CodeCompletionResultKind::Literal,
                                           SemanticContextKind::None);
diff --git a/test/IDE/complete_keywords.swift b/test/IDE/complete_keywords.swift
index 14979c18e971f..b3b85ac7a1409 100644
--- a/test/IDE/complete_keywords.swift
+++ b/test/IDE/complete_keywords.swift
@@ -377,6 +377,11 @@ struct InInit {
   init?() { #^IN_INIT_1?check=KW_DECL_STMT;check=KW_RETURN;check=KW_NO_IN^# }
 }
 
+struct InGenericTypeInit<T> {
+  init?() { return #^IN_INIT_2?check=KW_FAILABLE_INIT_NIL^# }
+  // KW_FAILABLE_INIT_NIL: Literal[Nil]/None: nil[#InGenericTypeInit<T>?#]; name=nil
+}
+
 struct InStruct {
   #^IN_NOMINAL_DECL_1?check=KW_DECL_TYPECONTEXT;check=KW_NO_INOUT^#
 }
diff --git a/validation-test/IDE/crashers_fixed/7068664dc48e3152.swift b/validation-test/IDE/crashers_fixed/7068664dc48e3152.swift
new file mode 100644
index 0000000000000..033bef753c513
--- /dev/null
+++ b/validation-test/IDE/crashers_fixed/7068664dc48e3152.swift
@@ -0,0 +1,3 @@
+// {"kind":"complete","signature":"swift::ide::CodeCompletionResultType::calculateTypeRelation(swift::ide::ExpectedTypeContext const*, swift::DeclContext const*, swift::ide::USRBasedTypeContext const*) const"}
+// RUN: %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
+class a<b { init ? { #^COMPLETE^#