diff --git a/src/EditorFeatures/Core/CommandHandlers/ExecuteInInteractiveCommandHandler.cs b/src/EditorFeatures/Core/CommandHandlers/ExecuteInInteractiveCommandHandler.cs
index 433b2124f1e7e413bdb0f0cfae7b8887b1452b94..7be31c67631ba9950a3412482a67b34db79e3fa2 100644
--- a/src/EditorFeatures/Core/CommandHandlers/ExecuteInInteractiveCommandHandler.cs
+++ b/src/EditorFeatures/Core/CommandHandlers/ExecuteInInteractiveCommandHandler.cs
@@ -38,7 +38,7 @@ internal class ExecuteInInteractiveCommandHandler
         private Lazy<IExecuteInInteractiveCommandHandler> GetCommandHandler(ITextBuffer textBuffer)
         {
             return _executeInInteractiveHandlers
-                .Where(handler => handler.Metadata.ContentTypes.Contains(textBuffer.ContentType.TypeName))
+                .Where(handler => handler.Metadata.ContentTypes.Any(textBuffer.ContentType.IsOfType))
                 .SingleOrDefault();
         }
 
diff --git a/src/VisualStudio/Core/Def/Implementation/CodeCleanup/CodeCleanupFixerProvider.cs b/src/VisualStudio/Core/Def/Implementation/CodeCleanup/CodeCleanupFixerProvider.cs
index 15a423e8d6ab97f99e525cfa15f831c212635571..bed1eb703a1ea58b24286cd098d547d18c575608 100644
--- a/src/VisualStudio/Core/Def/Implementation/CodeCleanup/CodeCleanupFixerProvider.cs
+++ b/src/VisualStudio/Core/Def/Implementation/CodeCleanup/CodeCleanupFixerProvider.cs
@@ -36,7 +36,7 @@ public IReadOnlyCollection<ICodeCleanUpFixer> GetFixers()
         public IReadOnlyCollection<ICodeCleanUpFixer> GetFixers(IContentType contentType)
         {
             var fixers = _codeCleanUpFixers
-               .Where(handler => handler.Metadata.ContentTypes.Contains(contentType.TypeName)).ToList();
+               .Where(handler => handler.Metadata.ContentTypes.Any(contentType.IsOfType)).ToList();
 
             return fixers.ConvertAll(l => l.Value);
         }