diff --git a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
index 7b88ade0ea..404b1e65da 100644
--- a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
+++ b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Controls.Utils
 
         public void Undo()
         {
-			if (_currentNode != null)  
+			if (_currentNode?.Previous != null)  
 			{
 				_currentNode = _currentNode.Previous;
 			}