diff --git a/MusicX/Controls/ListPlaylists.xaml b/MusicX/Controls/ListPlaylists.xaml
index 2b62a30..4edecd6 100644
--- a/MusicX/Controls/ListPlaylists.xaml
+++ b/MusicX/Controls/ListPlaylists.xaml
@@ -8,7 +8,6 @@
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     xmlns:models="clr-namespace:MusicX.Core.Models;assembly=MusicX.Core"
     xmlns:collections="clr-namespace:System.Collections;assembly=System.Runtime"
-    Margin="0,0,0,10"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:Name="Control"
@@ -19,6 +18,9 @@
             <DataTemplate DataType="{x:Type models:Playlist}" x:Key="FullPlaylistTemplate">
                 <local:PlaylistControl Margin="0,5" Width="200" Playlist="{Binding}" ShowFull="False" />
             </DataTemplate>
+            <DataTemplate DataType="{x:Type models:Playlist}" x:Key="FullSinglePlaylistTemplate">
+                <local:PlaylistControl Playlist="{Binding}" ShowFull="True" />
+            </DataTemplate>
             <DataTemplate DataType="{x:Type models:Playlist}" x:Key="PlaylistTemplate">
                 <local:PlaylistControl Margin="5,0" Width="200" Playlist="{Binding}" ShowFull="False" />
             </DataTemplate>
@@ -41,7 +43,7 @@
     </UserControl.Resources>
     
     <UserControl.ContentTemplate>
-        <DataTemplate DataType="{x:Type collections:IEnumerable}">
+        <DataTemplate DataType="{x:Type collections:IList}">
             <ui:ListView ItemsSource="{Binding}">
                 <ui:ListView.Style>
                     <Style TargetType="{x:Type ui:ListView}" BasedOn="{StaticResource ItemsListViewStyle}">
@@ -50,6 +52,14 @@
                                 <Setter Property="ItemsPanel" Value="{StaticResource FullPlaylistPanelTemplate}"/>
                                 <Setter Property="ItemTemplate" Value="{StaticResource FullPlaylistTemplate}"/>
                             </DataTrigger>
+                            <MultiDataTrigger>
+                                <MultiDataTrigger.Conditions>
+                                    <Condition Binding="{Binding ShowFull, ElementName=Control}" Value="True" />
+                                    <Condition Binding="{Binding Count}" Value="1" />
+                                </MultiDataTrigger.Conditions>
+                                
+                                <Setter Property="ItemTemplate" Value="{StaticResource FullSinglePlaylistTemplate}"/>
+                            </MultiDataTrigger>
                             <DataTrigger Binding="{Binding ShowFull, ElementName=Control}" Value="False">
                                 <Setter Property="ItemsPanel" Value="{StaticResource PlaylistPanelTemplate}"/>
                                 <Setter Property="ItemTemplate" Value="{StaticResource PlaylistTemplate}"/>
diff --git a/MusicX/Controls/PlaylistControl.xaml b/MusicX/Controls/PlaylistControl.xaml
index defe6e0..de24c1c 100644
--- a/MusicX/Controls/PlaylistControl.xaml
+++ b/MusicX/Controls/PlaylistControl.xaml
@@ -248,9 +248,10 @@
         <Grid
             x:Name="FullGrid"
             HorizontalAlignment="Stretch"
-            MouseLeftButtonDown="FullGrid_MouseLeftButtonDown"
             Visibility="Collapsed">
-            <StackPanel Orientation="Horizontal">
+            <controls:CardAction IsChevronVisible="False" MinWidth="300"
+                                 Click="CardAction_Click">
+                <StackPanel Orientation="Horizontal">
                 <Grid>
                     <Rectangle
                         Grid.Row="0"
@@ -322,7 +323,7 @@
 
                 </StackPanel>
             </StackPanel>
-
+            </controls:CardAction>
         </Grid>
 
 
diff --git a/MusicX/Controls/PlaylistControl.xaml.cs b/MusicX/Controls/PlaylistControl.xaml.cs
index 1a0afb6..48ac844 100644
--- a/MusicX/Controls/PlaylistControl.xaml.cs
+++ b/MusicX/Controls/PlaylistControl.xaml.cs
@@ -235,13 +235,6 @@ private void CardAction_Click(object sender, RoutedEventArgs e)
             notificationService.OpenExternalPage(new PlaylistView(Playlist));
         }
 
-        private void FullGrid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            var notificationService = StaticService.Container.GetRequiredService<NavigationService>();
-
-            notificationService.OpenExternalPage(new PlaylistView(Playlist));
-        }
-
         private void PlayPlaylistGrid_MouseEnter(object sender, MouseEventArgs e)
         {
             //this.Cursor = Cursors.Hand;