diff --git a/PROMS/Volian.Controls.Library/VlnSpellCheck.cs b/PROMS/Volian.Controls.Library/VlnSpellCheck.cs
index 00261916..e9a71054 100644
--- a/PROMS/Volian.Controls.Library/VlnSpellCheck.cs
+++ b/PROMS/Volian.Controls.Library/VlnSpellCheck.cs
@@ -27,10 +27,26 @@ namespace Volian.Controls.Library
 			while (MyEditItem.SpellCheckNext())
 			{
 				ItemInfo next = MyEditItem.MyItemInfo.SearchNext;
-				if (next == null || !next.IsStep) // B2016-063 check if next is not a step type instead of specifically a section
-					return; // spell check only current section
-				MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next);
-			}
+				//C2025-037 Evaluate the way that Spell Check (in step editor sections) is currently closing after one section.
+
+				if (next == null || next.IsProcedure) // B2016-063 check if next is not a step type instead of specifically a section
+                {
+                    return; // spell check only current procedure
+                }
+
+				//If it is a word document, find the next non-word document
+				while (next.HasWordContent)
+                {
+					next = next.SearchNext;
+
+					if (next == null || next.IsProcedure) // B2016-063 check if next is not a step type instead of specifically a section
+					{
+						return; // spell check only current procedure
+					}
+				}
+
+                MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next);
+            }
 			MyEditItem.SetFocus();
 		}