diff --git a/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift b/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift
index be11ec31ca..2002bb08fe 100644
--- a/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift	
+++ b/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift	
@@ -112,6 +112,7 @@ struct ActionsPanelViewModifier: ViewModifier {
         }
         .mailFloatingPanel(item: $reportForJunkMessages) { reportForJunkMessages in
             ReportJunkView(reportedMessages: reportForJunkMessages, origin: origin, completionHandler: completionHandler)
+                .environmentObject(mailboxManager) // Force environment object to prevent crash on macOS
         }
         .mailFloatingPanel(item: $blockSendersList,
                            title: MailResourcesStrings.Localizable.blockAnExpeditorTitle) { blockSenderState in
diff --git a/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift b/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift
index 60a8a24871..469a073ca1 100644
--- a/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift	
+++ b/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift	
@@ -25,10 +25,7 @@ import MailResources
 import SwiftUI
 
 struct ReportJunkView: View {
-    @InjectService private var platformDetector: PlatformDetectable
-
     @EnvironmentObject private var mailboxManager: MailboxManager
-    @Environment(\.dismiss) private var dismiss
 
     let reportedMessages: [Message]
     let origin: ActionOrigin
@@ -47,13 +44,6 @@ struct ReportJunkView: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
-            if platformDetector.isMac {
-                HeaderCloseButtonView(title: MailResourcesStrings.Localizable.actionReportJunk) {
-                    dismiss()
-                }
-                .padding(.horizontal, value: .medium)
-            }
-
             ForEach(filteredActions) { action in
                 if action != filteredActions.first {
                     IKDivider()