diff --git a/CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift b/CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift
index e8976d81e..1b9c1d0a3 100644
--- a/CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift
+++ b/CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift
@@ -8,6 +8,9 @@
 import SwiftUI
 
 struct TaskNotificationView: View {
+    @Environment(\.controlActiveState)
+    private var activeState
+
     @ObservedObject var taskNotificationHandler: TaskNotificationHandler
     @State private var isPresented: Bool = false
     @State var notification: TaskNotificationModel?
@@ -46,6 +49,7 @@ struct TaskNotificationView: View {
                     }
                 }
                 .transition(.opacity.combined(with: .move(edge: .trailing)))
+                .opacity(activeState == .inactive ? 0.4 : 1.0)
                 .padding(3)
                 .padding(-3)
                 .padding(.trailing, 3)
diff --git a/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift b/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift
index d2411ae8c..c25a985d4 100644
--- a/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift
+++ b/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift
@@ -11,6 +11,9 @@ struct SchemeDropDownView: View {
     @Environment(\.colorScheme)
     private var colorScheme
 
+    @Environment(\.controlActiveState)
+    private var activeState
+
     @State var isSchemePopOverPresented: Bool = false
     @State private var isHoveringScheme: Bool = false
 
@@ -33,7 +36,9 @@ struct SchemeDropDownView: View {
             Image(systemName: "folder.badge.gearshape")
                 .imageScale(.medium)
             Text(workspaceDisplayName)
+                .frame(minWidth: 0)
         }
+        .opacity(activeState == .inactive ? 0.4 : 1.0)
         .font(.subheadline)
         .padding(.trailing, 11.5)
         .padding(.horizontal, 2.5)
diff --git a/CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift b/CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift
index c3f64b391..dc897d268 100644
--- a/CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift
+++ b/CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift
@@ -11,6 +11,9 @@ struct TaskDropDownView: View {
     @Environment(\.colorScheme)
     private var colorScheme
 
+    @Environment(\.controlActiveState)
+    private var activeState
+
     @ObservedObject var taskManager: TaskManager
 
     @State private var isTaskPopOverPresented: Bool = false
@@ -28,8 +31,10 @@ struct TaskDropDownView: View {
                 }
             } else {
                 Text("Create Tasks")
+                    .frame(minWidth: 0)
             }
         }
+        .opacity(activeState == .inactive ? 0.4 : 1.0)
         .font(.subheadline)
         .padding(.trailing, 11.5)
         .padding(.horizontal, 2.5)
diff --git a/CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift b/CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift
index a2c1e3edc..4b0d4268b 100644
--- a/CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift
+++ b/CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift
@@ -18,6 +18,7 @@ struct TaskView: View {
         HStack(spacing: 5) {
             Image(systemName: "gearshape")
             Text(task.name)
+                .frame(minWidth: 0)
             Spacer(minLength: 0)
         }
         .padding(.trailing, 7.5)
diff --git a/CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift b/CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift
index 2d9315270..4ab717474 100644
--- a/CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift
+++ b/CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift
@@ -8,6 +8,9 @@
 import SwiftUI
 
 struct StartTaskToolbarButton: View {
+    @Environment(\.controlActiveState)
+    private var activeState
+
     @UpdatingWindowController var windowController: CodeEditWindowController?
 
     @ObservedObject var taskManager: TaskManager
@@ -28,6 +31,7 @@ struct StartTaskToolbarButton: View {
         } label: {
             Label("Start", systemImage: "play.fill")
                 .labelStyle(.iconOnly)
+                .opacity(activeState == .inactive ? 0.5 : 1.0)
                 .font(.system(size: 18, weight: .regular))
                 .help("Start selected task")
                 .frame(width: 28)
diff --git a/CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift b/CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift
index 837a834b0..559dbf0b7 100644
--- a/CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift
+++ b/CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift
@@ -9,6 +9,9 @@ import SwiftUI
 import Combine
 
 struct StopTaskToolbarButton: View {
+    @Environment(\.controlActiveState)
+    private var activeState
+
     @ObservedObject var taskManager: TaskManager
 
     /// Tracks the current selected task's status. Updated by `updateStatusListener`
@@ -25,6 +28,7 @@ struct StopTaskToolbarButton: View {
                     } label: {
                         Label("Stop", systemImage: "stop.fill")
                             .labelStyle(.iconOnly)
+                            .opacity(activeState == .inactive ? 0.5 : 1.0)
                             .font(.system(size: 15, weight: .regular))
                             .help("Stop selected task")
                             .frame(width: 28)