diff --git a/ZongziTEK_Blackboard_Sticker/Classes/Timetable.cs b/ZongziTEK_Blackboard_Sticker/Classes/Timetable.cs
index 9816599..d4a8965 100644
--- a/ZongziTEK_Blackboard_Sticker/Classes/Timetable.cs
+++ b/ZongziTEK_Blackboard_Sticker/Classes/Timetable.cs
@@ -35,6 +35,14 @@ public string ToCurriculums(List<Lesson> list)
             }
             return curriculums;
         }
+
+        public void Sort(Timetable timetable)
+        {
+            foreach (List<Lesson> day in new[] { timetable.Monday, timetable.Tuesday, timetable.Wednesday, timetable.Thursday, timetable.Friday, timetable.Saturday, timetable.Sunday, timetable.Temp })
+            {
+                day.Sort((x, y) => x.StartTime.CompareTo(y.StartTime));
+            }
+        }
     }
 
     public class Lesson
diff --git a/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml b/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml
index d3c8506..5e06a07 100644
--- a/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml
+++ b/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml
@@ -97,7 +97,7 @@
                 <Button Style="{StaticResource AccentButtonStyle}" Height="32" HorizontalAlignment="Right" Click="ButtonSave_Click">
                     <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8">
                         <ui:FontIcon Icon="{x:Static ui:FluentSystemIcons.Save_20_Regular}"/>
-                        <TextBlock Text="保存"/>
+                        <TextBlock Text="保存并排序"/>
                     </ikw:SimpleStackPanel>
                 </Button>
             </Grid>
diff --git a/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml.cs b/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml.cs
index d207dac..104b29d 100644
--- a/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml.cs
+++ b/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml.cs
@@ -67,6 +67,8 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
 
         private void ButtonSave_Click(object sender, RoutedEventArgs e)
         {
+            Timetable.Sort(Timetable);
+
             string text = JsonConvert.SerializeObject(Timetable, Formatting.Indented);
             try
             {
@@ -75,6 +77,8 @@ private void ButtonSave_Click(object sender, RoutedEventArgs e)
             catch { }
             isEdited = false;
 
+            LoadTimetable();
+
             //isCloseWithoutWarning = true;
             //Close();
         }