diff --git a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
index 404b1e65da..2301198a01 100644
--- a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
+++ b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
@@ -68,7 +68,7 @@ namespace Avalonia.Controls.Utils
 
         public void Redo()
         {            
-			if (_currentNode != null) {
+			if (_currentNode?.Next != null) {
 				_currentNode = _currentNode.Next;
 			}