diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/MainWindowViewModel.cs b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/MainWindowViewModel.cs
index 7df1c21..b6757fe 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/MainWindowViewModel.cs
@@ -316,14 +316,14 @@ namespace FRESHMusicPlayer.ViewModels
             {
                 Player.Queue.Add(args.ToArray());
                 Player.PlayMusic();
+                Player.PauseMusic();
             }
             else
             {
                 if (!string.IsNullOrEmpty(Config.FilePath))
                 {
                     Player.PlayMusic(Config.FilePath);
-                    Player.CurrentTime.Add(TimeSpan.FromSeconds(Config.FilePosition));
-                    Player.PauseMusic();
+                    Player.CurrentTime.Add(TimeSpan.FromSeconds(Config.FilePosition)); 
                 }
             }
         }
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/QueueManagementViewModel.cs b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/QueueManagementViewModel.cs
index d95848a..5e3f314 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/QueueManagementViewModel.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/QueueManagementViewModel.cs
@@ -19,11 +19,8 @@ namespace FRESHMusicPlayer.ViewModels
 
         public ObservableCollection<QueueManagementEntry> Queue { get; set; } = new();
 
-        private bool isReady = false;
-
         public void Update()
         {
-            isReady = false;
             Queue.Clear();
             int number = 1;
             foreach (var track in Player.Queue.Queue)
@@ -40,7 +37,6 @@ namespace FRESHMusicPlayer.ViewModels
                 Queue.Add(entry);
                 number++;
             }
-            isReady = true;
         }
 
         public void JumpToCommand(int position)
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
index 28c3565..163bcb4 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
@@ -83,7 +83,26 @@
 					<ColumnDefinition Width="1*" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
-				<Image x:Name="CoverArtImage" Source="{Binding CoverArt}" Grid.Column="0" Margin="10,10,0,5" />
+				<Image x:Name="CoverArtImage" Source="{Binding CoverArt}" Grid.Column="0" Margin="10,10,0,5" ToolTip.ShowDelay="10">
+					<Image.ContextMenu>
+						<ContextMenu>
+							<MenuItem Command="{Binding OpenTagEditorCommand}" Header="Tag Editor"/>
+							<MenuItem Command="{Binding OpenPlaylistManagementCommand}" Header="Playlist Management"/>
+							<MenuItem Command="{Binding OpenTrackCommand}" Header="Open"/>
+							<MenuItem Header="Go to">
+								<MenuItem Command="{Binding GoToArtistCommand}" Header="Artist"/>
+								<MenuItem Command="{Binding GoToAlbumCommand}" Header="Album"/>
+							</MenuItem>
+							<MenuItem Command="{Binding OpenLyricsCommand}" Header="Lyrics"/>
+							<Separator/>
+							<MenuItem Command="{Binding MiniPlayerCommand}" Header="Mini Player"/>
+							<MenuItem Command="{Binding PauseAfterCurrentTrackCommand}" Header="Pause after current track"/>
+						</ContextMenu>
+					</Image.ContextMenu>
+					<ToolTip.Tip>
+						<Image Source="{Binding CoverArt}"/>
+					</ToolTip.Tip>
+				</Image>
 				<!--Middle Section-->
 				<Grid Grid.Column="1" Margin="0,10,0,5">
 					<Grid.RowDefinitions>
diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Handlers/Configuration/ConfigurationFile.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Handlers/Configuration/ConfigurationFile.cs
index 3400a11..a1ecac7 100644
--- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Handlers/Configuration/ConfigurationFile.cs
+++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Handlers/Configuration/ConfigurationFile.cs
@@ -69,4 +69,5 @@ namespace FRESHMusicPlayer.Handlers.Configuration
         public Menu CurrentMenu { get; set; } = Menu.Import;
         public List<string> AutoImportPaths { get; set; } = new List<string>();
     }
+
 }