diff --git a/src/views/obs/QueueOBS.vue b/src/views/obs/QueueOBS.vue
index 95d6844..1959397 100644
--- a/src/views/obs/QueueOBS.vue
+++ b/src/views/obs/QueueOBS.vue
@@ -38,15 +38,15 @@ const activeItems = computed(() => {
   let list = new List(queue.value).Where((q) => q?.status == QueueStatus.Waiting).OrderByDescending((q) => q.from == QueueFrom.Manual)
   switch (settings.value.sortType) {
     case QueueSortType.TimeFirst: {
-      list = list.OrderByDescending((q) => q.createAt)
+      list = list.ThenBy((q) => q.createAt)
       break
     }
     case QueueSortType.GuardFirst: {
-      list = list.OrderBy((q) => q.user?.guard_level).ThenByDescending((q) => q.createAt)
+      list = list.OrderBy((q) => q.user?.guard_level).ThenBy((q) => q.createAt)
       break
     }
     case QueueSortType.PaymentFist: {
-      list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenByDescending((q) => q.createAt)
+      list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenBy((q) => q.createAt)
     }
   }
   if(settings.value.isReverse){
diff --git a/src/views/open_live/OpenQueue.vue b/src/views/open_live/OpenQueue.vue
index c9640f9..0ee7251 100644
--- a/src/views/open_live/OpenQueue.vue
+++ b/src/views/open_live/OpenQueue.vue
@@ -151,20 +151,21 @@ const queue = computed(() => {
     .OrderByDescending((q) => q.from == QueueFrom.Manual)
   switch (settings.value.sortType) {
     case QueueSortType.TimeFirst: {
-      list = list.OrderByDescending((q) => q.createAt)
+      list = list.ThenBy((q) => q.createAt)
       break
     }
     case QueueSortType.GuardFirst: {
-      list = list.OrderBy((q) => q.user?.guard_level).ThenByDescending((q) => q.createAt)
+      list = list.OrderBy((q) => q.user?.guard_level).ThenBy((q) => q.createAt)
       break
     }
     case QueueSortType.PaymentFist: {
-      list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenByDescending((q) => q.createAt)
+      list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenBy((q) => q.createAt)
     }
   }
   if (configCanEdit.value ? settings.value.isReverse : isReverse.value) {
     list = list.Reverse()
   }
+  list = list.OrderByDescending((q) => q.status == QueueStatus.Progressing ? 1 : 0)
   return list.ToArray()
 })
 const historySongs = computed(() => {