diff --git a/RedBookPlayer.GUI/ViewModels/MainViewModel.cs b/RedBookPlayer.GUI/ViewModels/MainViewModel.cs
index 79a8ef0..17172c8 100644
--- a/RedBookPlayer.GUI/ViewModels/MainViewModel.cs
+++ b/RedBookPlayer.GUI/ViewModels/MainViewModel.cs
@@ -100,6 +100,12 @@ namespace RedBookPlayer.GUI.ViewModels
                 PlayerView?.ViewModel?.ExecutePreviousTrack();
             }
 
+            // Shuffle Track List
+            // else if(e.Key == App.Settings.ShuffleTracksKey)
+            // {
+            //     PlayerView?.ViewModel?.ExecuteShuffle();
+            // }
+
             // Next Index
             else if(e.Key == App.Settings.NextIndexKey)
             {
diff --git a/RedBookPlayer.GUI/ViewModels/PlayerViewModel.cs b/RedBookPlayer.GUI/ViewModels/PlayerViewModel.cs
index f8a7b31..45a9d08 100644
--- a/RedBookPlayer.GUI/ViewModels/PlayerViewModel.cs
+++ b/RedBookPlayer.GUI/ViewModels/PlayerViewModel.cs
@@ -470,6 +470,11 @@ namespace RedBookPlayer.GUI.ViewModels
         /// </summary>
         public void ExecutePreviousTrack() => _player?.PreviousTrack();
 
+        /// <summary>
+        /// Shuffle the current track list
+        /// </summary>
+        public void ExecuteShuffle() => _player?.ShuffleTracks();
+
         /// <summary>
         /// Move to the next index
         /// </summary>
diff --git a/RedBookPlayer.GUI/ViewModels/SettingsViewModel.cs b/RedBookPlayer.GUI/ViewModels/SettingsViewModel.cs
index e51125d..4754fb9 100644
--- a/RedBookPlayer.GUI/ViewModels/SettingsViewModel.cs
+++ b/RedBookPlayer.GUI/ViewModels/SettingsViewModel.cs
@@ -180,6 +180,11 @@ namespace RedBookPlayer.GUI.ViewModels
         /// </summary>
         public Key PreviousTrackKey { get; set; } = Key.Left;
 
+        /// <summary>
+        /// Key assigned to shuffling the track list
+        /// </summary>
+        // public Key ShuffleTracksKey { get; set; } = Key.R;
+
         /// <summary>
         /// Key assigned to move to the next index
         /// </summary>
diff --git a/RedBookPlayer.Models/Hardware/Player.cs b/RedBookPlayer.Models/Hardware/Player.cs
index b5fdf30..bd3ce3a 100644
--- a/RedBookPlayer.Models/Hardware/Player.cs
+++ b/RedBookPlayer.Models/Hardware/Player.cs
@@ -415,7 +415,7 @@ namespace RedBookPlayer.Models.Hardware
         }
 
         /// <summary>
-        /// Load the track list into the track dictionary for the current disc
+        /// Load the track list into the track dictionary
         /// </summary>
         private void LoadTrackList()
         {
@@ -455,6 +455,14 @@ namespace RedBookPlayer.Models.Hardware
             }
 
             // Try to get back to the last loaded track
+            SetTrackOrderIndex();
+        }
+
+        /// <summary>
+        /// Set the current track order index, if possible
+        /// </summary>
+        private void SetTrackOrderIndex()
+        {
             int currentFoundTrack = 0;
             if(_trackPlaybackOrder == null || _trackPlaybackOrder.Count == 0)
             {
@@ -553,6 +561,16 @@ namespace RedBookPlayer.Models.Hardware
             }
 
             _trackPlaybackOrder = newPlaybackOrder;
+            switch(PlayerState)
+            {
+                case PlayerState.Stopped:
+                    _currentTrackInOrder = 0;
+                    break;
+                case PlayerState.Paused:
+                case PlayerState.Playing:
+                    SetTrackOrderIndex();
+                    break;
+            }
         }
 
         /// <summary>
@@ -924,7 +942,7 @@ namespace RedBookPlayer.Models.Hardware
                 _opticalDiscs[CurrentDisc].LoadTrack(trackNumber);
             }
 
-            LoadTrackList();
+            SetTrackOrderIndex();
             if(wasPlaying == PlayerState.Playing)
                 Play();