This fixes LT-22541.

Author: jtmaxwell3

Src/LexText/Interlinear/SandboxBase.cs

@@ -1658,17 +1658,30 @@ private int CreateSecondaryAndCopyStrings(int flidChoices, int hvoMain, int flid
 
 publicvoidUpdateField(inthvo,intflid)
 {
-inthvoMorph=GetHvoMorphForLexSense(hvo);
-if(hvoMorph!=0)
+ICmObjecthvoObject=Caches.MainCache.ServiceLocator.GetInstance<ICmObjectRepository>().GetObject(hvo);
+if(hvoObjectisILexSenselexSense)
 {
-ILexSenselexSense=Caches.MainCache.ServiceLocator.GetInstance<ILexSenseRepository>().GetObject(hvo);
-ILexEntrylexEntry=lexSense?.OwnerasILexEntry;
-if(lexSense!=null&&lexEntry!=null)
+inthvoMorph=GetHvoMorphForLexSense(hvo);
+if(hvoMorph!=0&&lexSense.OwnerisILexEntrylexEntry)
 {
 // This fixes LT-22534.
 EstablishDefaultSense(hvoMorph,lexEntry,lexSense,null);
 }
-
+}
+if(hvoObject!=null&&hvoObject.OwnerisIMoMorphSynAnalysismsa)
+{
+if(msa.OwnerisILexEntrylexEntry)
+{
+foreach(varsenseinlexEntry.SensesOS)
+{
+inthvoMorph=GetHvoMorphForLexSense(sense.Hvo);
+if(hvoMorph!=0&&sense.MorphoSyntaxAnalysisRA==msa)
+{
+// This fixes LT-22541.
+EstablishDefaultSense(hvoMorph,lexEntry,sense,null);
+}
+}
+}
 }
 }
 

Src/xWorks/PopupToolWindow.cs

@@ -1,4 +1,3 @@
-usingSIL.FieldWorks.Common.FwUtils;
 usingSIL.FieldWorks.Common.RootSites;
 usingSIL.LCModel;
 usingSIL.Utils;