diff --git a/Plugins/Flow.Launcher.Plugin.Folder/FolderPluginSettings.xaml b/Plugins/Flow.Launcher.Plugin.Folder/FolderPluginSettings.xaml
index 9507f8484..009159426 100644
--- a/Plugins/Flow.Launcher.Plugin.Folder/FolderPluginSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Folder/FolderPluginSettings.xaml
@@ -5,27 +5,28 @@
 			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
 			 mc:Ignorable="d" 
 			 d:DesignHeight="300" d:DesignWidth="500">
-	<Grid Margin="10">
+    <UserControl.Resources>
+        <DataTemplate x:Key="ListViewTemplate">
+            <TextBlock
+                Text="{Binding Nickname, Mode=OneTime}"
+                Margin="0,5,0,5" />
+        </DataTemplate>
+    </UserControl.Resources>
+    <Grid Margin="10">
 		<Grid.RowDefinitions>
 			<RowDefinition Height="*"/>
-			<RowDefinition Height="50"/>
+			<RowDefinition Height="100"/>
 		</Grid.RowDefinitions>
-        <ListView x:Name="lbxFolders" Grid.Row="0" AllowDrop="True"
-                 Drop="lbxFolders_Drop"
-                 DragEnter="lbxFolders_DragEnter">
-            <ListView.View>
-				<GridView>
-					<GridViewColumn Header="{DynamicResource flowlauncher_plugin_folder_folder_path}"  Width="180">
-						<GridViewColumn.CellTemplate>
-							<DataTemplate>
-								<TextBlock Text="{Binding Path}"/>
-							</DataTemplate>
-						</GridViewColumn.CellTemplate>
-					</GridViewColumn>
-				</GridView>
-			</ListView.View>
-		</ListView>
-		<StackPanel Grid.Row="1" HorizontalAlignment="Right" Orientation="Horizontal">
+        <ScrollViewer Margin="0 35 0 0" HorizontalScrollBarVisibility="Hidden">
+            <StackPanel>
+                <ListView
+                        x:Name="lbxFolders" Grid.Row="0" AllowDrop="True"
+                        Drop="lbxFolders_Drop"
+                        DragEnter="lbxFolders_DragEnter"
+                        ItemTemplate="{StaticResource ListViewTemplate}"/>
+            </StackPanel>
+        </ScrollViewer>
+        <StackPanel Grid.Row="1" HorizontalAlignment="Right" Orientation="Horizontal">
 			<Button x:Name="btnDelete" Click="btnDelete_Click" Width="100" Margin="10" Content="{DynamicResource flowlauncher_plugin_folder_delete}"/>
             <Button x:Name="btnEdit" Click="btnEdit_Click" Width="100" Margin="10" Content="{DynamicResource flowlauncher_plugin_folder_edit}"/>
             <Button x:Name="btnAdd" Click="btnAdd_Click" Width="100" Margin="10" Content="{DynamicResource flowlauncher_plugin_folder_add}"/>