diff --git a/src/Perspex.Controls/Utils/UndoRedoHelper.cs b/src/Perspex.Controls/Utils/UndoRedoHelper.cs
index 9de2ca9b35..70e5921d8d 100644
--- a/src/Perspex.Controls/Utils/UndoRedoHelper.cs
+++ b/src/Perspex.Controls/Utils/UndoRedoHelper.cs
@@ -37,7 +37,12 @@ namespace Perspex.Controls.Utils
 
         public void Undo()
         {
-            _host.UndoRedoState= (_currentNode = _currentNode?.Previous ?? _currentNode).Value;
+			if (_currentNode != null)  
+			{
+				_currentNode = _currentNode.Previous;
+			}
+
+			_host.UndoRedoState = _currentNode?.Value;            
         }
 
         public bool IsLastState => _currentNode.Next == null;
@@ -62,8 +67,12 @@ namespace Perspex.Controls.Utils
         }
 
         public void Redo()
-        {
-            _host.UndoRedoState = (_currentNode = _currentNode?.Next ?? _currentNode).Value;
+        {            
+			if (_currentNode != null) {
+				_currentNode = _currentNode.Next;
+			}
+
+			_host.UndoRedoState = _currentNode?.Value;
         }
 
         public void Snapshot()