diff --git a/PianoSheetViewer/MainPage.xaml b/PianoSheetViewer/MainPage.xaml
index bdf235c..2de5c69 100644
--- a/PianoSheetViewer/MainPage.xaml
+++ b/PianoSheetViewer/MainPage.xaml
@@ -73,6 +73,8 @@
             OverflowButtonVisibility="Collapsed"
             DefaultLabelPosition="Right">
             <AppBarButton Icon="Scan" Label="{x:Bind SearchFolderPath, Mode=OneWay}" Click="OnSearchFolderClick" />
+            <AppBarButton Icon="Sort" Label="Name" Click="OnNameSortClick" />
+            <AppBarButton Icon="Sort" Label="Type" Click="OnTypeSortClick" />
             <AppBarButton Icon="Zoom" Label="Item Size" Flyout="{StaticResource ZoomFlyout}" />
         </CommandBar>
         <GridView 
diff --git a/PianoSheetViewer/MainPage.xaml.cs b/PianoSheetViewer/MainPage.xaml.cs
index aa2ff9a..c368fd2 100644
--- a/PianoSheetViewer/MainPage.xaml.cs
+++ b/PianoSheetViewer/MainPage.xaml.cs
@@ -79,6 +79,64 @@ private async void OnSearchFolderClick(object sender, RoutedEventArgs e)
             }
         }
 
+        private async void OnNameSortClick(object sender, RoutedEventArgs e)
+        {
+            lock (_syncIsBusy)
+            {
+                if (IsBusy)
+                {
+                    return;
+                }
+                else
+                {
+                    IsBusy = true;
+                }
+            }
+
+            LoadingMsg = "Loading...";
+            List<PianoSheetInfo> sortedSheets = PianoSheets.OrderBy(sheet => sheet.Name).ToList();
+            PianoSheets.Clear();
+            foreach (PianoSheetInfo pianoSheetInfo in sortedSheets)
+            {
+                PianoSheets.Add(pianoSheetInfo);
+                await Task.Delay(100);
+            }
+
+            lock (_syncIsBusy)
+            {
+                IsBusy = false;
+            }
+        }
+
+        private async void OnTypeSortClick(object sender, RoutedEventArgs e)
+        {
+            lock (_syncIsBusy)
+            {
+                if (IsBusy)
+                {
+                    return;
+                }
+                else
+                {
+                    IsBusy = true;
+                }
+            }
+
+            LoadingMsg = "Loading...";
+            List<PianoSheetInfo> sortedSheets = PianoSheets.OrderBy(sheet => sheet.FileType).ToList();
+            PianoSheets.Clear();
+            foreach (PianoSheetInfo pianoSheetInfo in sortedSheets)
+            {
+                PianoSheets.Add(pianoSheetInfo);
+                await Task.Delay(100);
+            }
+
+            lock (_syncIsBusy)
+            {
+                IsBusy = false;
+            }
+        }
+
         private async void UpdatePianoSheetsFromFolder(StorageFolder searchFolder)
         {
             lock (_syncIsBusy)