diff --git a/Source/gui/SNTBinaryMessageWindowView.swift b/Source/gui/SNTBinaryMessageWindowView.swift
index b423eae93..8126f4faf 100644
--- a/Source/gui/SNTBinaryMessageWindowView.swift
+++ b/Source/gui/SNTBinaryMessageWindowView.swift
@@ -177,8 +177,8 @@ struct MoreDetailsView: View {
             }
           }
           .buttonStyle(ScalingButtonStyle())
-          .keyboardShortcut(.escape, modifiers: .command)
-          .help("⌘ Esc")
+          .keyboardShortcut(.cancelAction)
+          .help("Esc")
         }
 
         Spacer()
diff --git a/Source/gui/SNTFileAccessMessageWindowView.swift b/Source/gui/SNTFileAccessMessageWindowView.swift
index 57d80916c..9aa74a7bf 100644
--- a/Source/gui/SNTFileAccessMessageWindowView.swift
+++ b/Source/gui/SNTFileAccessMessageWindowView.swift
@@ -161,8 +161,8 @@ struct MoreDetailsView: View {
             }
           }
           .buttonStyle(ScalingButtonStyle())
-          .keyboardShortcut(.escape, modifiers: .command)
-          .help("⌘ Esc")
+          .keyboardShortcut(.cancelAction)
+          .help("Esc")
         }
 
         Spacer()
diff --git a/Source/gui/SNTMessageView.swift b/Source/gui/SNTMessageView.swift
index 58c1239d8..b588dc297 100644
--- a/Source/gui/SNTMessageView.swift
+++ b/Source/gui/SNTMessageView.swift
@@ -343,8 +343,8 @@ public func DismissButton(
       Text(t).frame(maxWidth: 200.0)
     }
   )
-  .keyboardShortcut(.escape, modifiers: .command)
-  .help("⌘ Esc")
+  .keyboardShortcut("w", modifiers: .command)
+  .help("⌘ W")
 }
 
 // TextWithLimit is like Text() but it supports a limit on the number of characters in the
diff --git a/Source/gui/SNTNetworkMountMessageWindowView.swift b/Source/gui/SNTNetworkMountMessageWindowView.swift
index b68f87ebe..352227437 100644
--- a/Source/gui/SNTNetworkMountMessageWindowView.swift
+++ b/Source/gui/SNTNetworkMountMessageWindowView.swift
@@ -153,8 +153,8 @@ struct MoreDetailsView: View {
             }
           }
           .buttonStyle(ScalingButtonStyle())
-          .keyboardShortcut(.escape, modifiers: .command)
-          .help("⌘ Esc")
+          .keyboardShortcut(.cancelAction)
+          .help("Esc")
         }
 
         Spacer()
diff --git a/Source/gui/SNTTestGUI.swift b/Source/gui/SNTTestGUI.swift
index 59c31e5a8..0c5a9da43 100644
--- a/Source/gui/SNTTestGUI.swift
+++ b/Source/gui/SNTTestGUI.swift
@@ -270,13 +270,17 @@ struct BinaryView: View {
         case .Nov25: Date.overrideDate = Date(timeIntervalSince1970: 1732544115)
         }
 
+        // Mirror SNTExecutionController.mm: customURL falls back to the EventDetailURL
+        // config so the Open Event button appears in the harness.
+        let effectiveURL = customURL.isEmpty ? eventDetailURL : customURL
+
         let window = NSWindow()
         ShowWindow(
           SNTBinaryMessageWindowViewFactory.createWith(
             window: window,
             event: event,
             customMsg: customMsg as NSString?,
-            customURL: customURL as NSString?,
+            customURL: effectiveURL.isEmpty ? nil : (effectiveURL as NSString),
             configState: SNTConfigState(config: SNTConfigurator.configurator()),
             bundleProgress: SNTBundleProgress(),
             uiStateCallback: { interval in print("Silence interval was set to \(interval)") },