diff --git a/src/Eto.Gtk/Forms/Controls/GridHandler.cs b/src/Eto.Gtk/Forms/Controls/GridHandler.cs
index 868235f6b..ee828ce49 100644
--- a/src/Eto.Gtk/Forms/Controls/GridHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/GridHandler.cs
@@ -746,7 +746,10 @@ private void SetSelectionMode(bool allowEmptySelection, bool allowMultipleSelect
 						Control.Selection.SelectPath(cursorRowPath);
 					}
 				}
-				Control.Selection.Mode = newMode;
+				else
+				{
+					Control.Selection.Mode = newMode;
+				}
 			}
 		}