diff --git a/frontend/app/experiments/JobDetail.tsx b/frontend/app/experiments/JobDetail.tsx
index ca8e3f86..e1166f95 100644
--- a/frontend/app/experiments/JobDetail.tsx
+++ b/frontend/app/experiments/JobDetail.tsx
@@ -100,12 +100,14 @@ export default function JobDetail({ jobID }: JobDetailProps) {
   }, [jobID, job.State]);
 
   useEffect(() => {
-    if (tool?.ToolJson?.checkpointCompatible) {
-      setActiveTab("metrics");
-    } else {
-      setActiveTab("logs");
+    if (activeTab === "" && tool?.ToolJson){
+      if (tool?.ToolJson?.checkpointCompatible) {
+        setActiveTab("metrics");
+      } else {
+        setActiveTab("logs");
+      }
     }
-  }, [tool]);
+  }, [tool, activeTab]);
 
   return (
     <Tabs value={activeTab} onValueChange={setActiveTab} className="w-full @container">
diff --git a/gateway/handlers/flows.go b/gateway/handlers/flows.go
index 90166841..3ec8982b 100644
--- a/gateway/handlers/flows.go
+++ b/gateway/handlers/flows.go
@@ -315,6 +315,7 @@ func ListFlowsHandler(db *gorm.DB) http.HandlerFunc {
 		if walletAddress := r.URL.Query().Get("walletAddress"); walletAddress != "" {
 			query = query.Where("wallet_address = ?", walletAddress)
 		}
+		query = query.Order("start_time DESC")
 
 		var flows []models.Flow
 		if result := query.Preload("Jobs").Find(&flows); result.Error != nil {