diff --git a/src/Eto.Wpf/Forms/Controls/GridHandler.cs b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
index 040d83669..7302a635f 100755
--- a/src/Eto.Wpf/Forms/Controls/GridHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
@@ -121,7 +121,7 @@ public abstract class GridHandler<TWidget, TCallback> : WpfControl<EtoDataGrid,
 		const double DragScrollFastDelay = 0.01;
 		
 		ContextMenu contextMenu;
-		bool hasFocus;
+		bool hadFocus;
 		protected bool SkipSelectionChanged { get; set; }
 		protected swc.DataGridColumn CurrentColumn { get; set; }
 
@@ -824,16 +824,16 @@ protected void RestoreColumnFocus()
 		protected void SaveFocus()
 		{
 			SaveColumnFocus();
-			hasFocus = HasFocus;
+			hadFocus = HasFocus && Widget.ParentWindow?.HasFocus == true;
 		}
 
 		protected void RestoreFocus()
 		{
-			if (hasFocus)
-			{
+			if (hadFocus)
 				Focus();
+
+			if (CurrentColumn != null)
 				RestoreColumnFocus();
-			}
 		}
 		
 		GridColumn GetColumn(swc.DataGridColumn dataGridColumn)