diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs
index eea8e220..c9f31ea5 100644
--- a/PROMS/Volian.Controls.Library/GridItem.cs
+++ b/PROMS/Volian.Controls.Library/GridItem.cs
@@ -158,9 +158,7 @@ namespace Volian.Controls.Library
 		void MyStepRTB_DoSaveContents(object sender, EventArgs args)
 		{
 			SaveCurrentAndContents();
-		}
-
-		
+		}	
 		void MyStepRTB_VisibleChanged(object sender, EventArgs e)
 		{
 			MyStepRTB.EditMode = MyStepRTB.Visible;
@@ -275,11 +273,25 @@ namespace Volian.Controls.Library
 			this.MyFlexGrid.AdjustPastedText += new VlnFlexGridPasteEvent(MyFlexGrid_AdjustPastedText);
 			this.MyStepRTB.SetMenu += new StepRTBMenuEvent(MyStepRTB_SetMenu);
 			this.MyStepRTB.OpenContextMenu += new StepRTBLocationEvent(MyStepRTB_OpenContextMenu);
+			this.MyFlexGrid.EnterKeyPressed += new VlnFlexGridkeyEvent(MyFlexGrid_EnterKeyPressed);
+			//this.MyStepRTB.EnterKeyPressed += new StepRTBCursorKeysEvent(MyStepRTB_EnterKeyPressed);
 			// This Resize event has been useful for debugging purposes numerous times
 			//
 			//this.MyStepRTB.Resize += new EventHandler(MyStepRTB_Resize);
 		}
 
+		//void MyStepRTB_EnterKeyPressed(object sender, KeyEventArgs args)
+		//{
+		//    args.Handled = true;
+		//    MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ProcessEnterKey();
+		//}
+
+		void MyFlexGrid_EnterKeyPressed(object sender, KeyEventArgs args)
+		{
+			args.Handled = true;
+			MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ProcessEnterKey();
+		}
+
 		void MyStepRTB_OpenContextMenu(object sender, StepRTBLocationEventArgs args)
 		{
 			MyStepPanel.MyStepTabPanel.MyStepTabRibbon.OpenContextMenu(args.Location);