diff --git a/src/Classes/GemSelectControl.lua b/src/Classes/GemSelectControl.lua
index 0cc84a9e4e..1e8b220270 100644
--- a/src/Classes/GemSelectControl.lua
+++ b/src/Classes/GemSelectControl.lua
@@ -112,13 +112,14 @@ function GemSelectClass:PopulateGemList()
 		if not gemData.grantedEffect.hideFromGemList and (self.sortGemsBy and gemData.tags[self.sortGemsBy] == true or not self.sortGemsBy) then
 			local levelRequirement = gemData.grantedEffect.levels[1].levelRequirement or 1
 			if characterLevel >= levelRequirement or not matchLevel then
+				local isLegacyAwakened = gemData.grantedEffect.legacy and gemData.grantedEffect.plusVersionOf
 				if self.imbuedSelect then
 					-- Imbued dropdown only allows non-exceptional support gems and supports that don't grant active skills
-					if gemData.grantedEffect.support and not gemData.tagString:match("Exceptional") and not gemData.grantedEffect.plusVersionOf and (not gemData.secondaryGrantedEffect or gemData.secondaryGrantedEffect.support) then
+					if gemData.grantedEffect.support and not gemData.tagString:match("Exceptional") and not isLegacyAwakened and (not gemData.secondaryGrantedEffect or gemData.secondaryGrantedEffect.support) then
 						self.gems["Default:" .. gemId] = gemData
 					end
 				else
-					if (showExceptional or showAll) and ((gemData.grantedEffect.legacy and gemData.grantedEffect.plusVersionOf) or gemData.tagString:match("Exceptional")) then
+					if (showExceptional or showAll) and (isLegacyAwakened or gemData.tagString:match("Exceptional")) then
 						if self.skillsTab.showLegacyGems or not gemData.grantedEffect.legacy then
 							self.gems["Default:" .. gemId] = gemData
 						end