diff --git a/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift b/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
index 0ec462a19..ffc1162be 100644
--- a/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
+++ b/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
@@ -11,7 +11,7 @@ import RSCore
 import Account
 import RSTree
 
-class SidebarCell : NSTableCellView {
+@MainActor final class SidebarCell : NSTableCellView {
 
 	var iconImage: IconImage? {
 		didSet {
diff --git a/Mac/MainWindow/Timeline/TimelineContainerView.swift b/Mac/MainWindow/Timeline/TimelineContainerView.swift
index e75475405..6a8b42298 100644
--- a/Mac/MainWindow/Timeline/TimelineContainerView.swift
+++ b/Mac/MainWindow/Timeline/TimelineContainerView.swift
@@ -8,7 +8,7 @@
 
 import AppKit
 
-final class TimelineContainerView: NSView {
+@MainActor final class TimelineContainerView: NSView {
 
 	private var contentViewConstraints: [NSLayoutConstraint]?
 
diff --git a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
index c697a1a0c..81ec39b30 100644
--- a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
+++ b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
@@ -17,7 +17,7 @@ protocol TimelineContainerViewControllerDelegate: AnyObject {
 
 }
 
-final class TimelineContainerViewController: NSViewController {
+@MainActor final class TimelineContainerViewController: NSViewController {
 
 	@IBOutlet weak var viewOptionsPopUpButton: NSPopUpButton!
 	@IBOutlet weak var newestToOldestMenuItem: NSMenuItem!
diff --git a/Mac/MainWindow/Timeline/TimelineTableRowView.swift b/Mac/MainWindow/Timeline/TimelineTableRowView.swift
index 54d87479c..d4598ef1e 100644
--- a/Mac/MainWindow/Timeline/TimelineTableRowView.swift
+++ b/Mac/MainWindow/Timeline/TimelineTableRowView.swift
@@ -8,7 +8,7 @@
 
 import AppKit
 
-class TimelineTableRowView : NSTableRowView {
+@MainActor final class TimelineTableRowView : NSTableRowView {
 
 	private var separator: NSView?
 	
diff --git a/Mac/MainWindow/Timeline/TimelineTableView.swift b/Mac/MainWindow/Timeline/TimelineTableView.swift
index e70bbed17..f5d8a9469 100644
--- a/Mac/MainWindow/Timeline/TimelineTableView.swift
+++ b/Mac/MainWindow/Timeline/TimelineTableView.swift
@@ -9,7 +9,7 @@
 import AppKit
 import RSCore
 
-class TimelineTableView: NSTableView {
+@MainActor final class TimelineTableView: NSTableView {
 	
 	weak var keyboardDelegate: KeyboardDelegate?