diff --git a/ApplicationLibrary/Views/Connections/ConnectionListView.swift b/ApplicationLibrary/Views/Connections/ConnectionListView.swift
index a27b003..e27d627 100644
--- a/ApplicationLibrary/Views/Connections/ConnectionListView.swift
+++ b/ApplicationLibrary/Views/Connections/ConnectionListView.swift
@@ -28,7 +28,7 @@ public struct ConnectionListView: View {
         }
         #if !os(tvOS)
         .toolbar {
-            ToolbarItem {
+            ToolbarItemGroup(placement: .topBarTrailing) {
                 Menu {
                     Picker("State", selection: $viewModel.connectionStateFilter) {
                         ForEach(ConnectionStateFilter.allCases) { state in
@@ -48,6 +48,10 @@ public struct ConnectionListView: View {
                 } label: {
                     Label("Filter", systemImage: "line.3.horizontal.circle")
                 }
+                if #available(iOS 26.0, *), !Variant.debugNoIOS26 {
+                } else {
+                    StartStopButton()
+                }
             }
         }
         #endif
diff --git a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
index 2b4bd46..f6c0017 100644
--- a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
+++ b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
@@ -258,7 +258,7 @@ import SwiftUI
                     StartStopButton()
                 #else
                     if #available(iOS 26.0, *), !Variant.debugNoIOS26 {
-                    } else {
+                    } else if !useLegacyTabView || coordinator.selection != .connections {
                         StartStopButton()
                     }
                 #endif