diff --git a/src/auto-reply/reply/get-reply.ts b/src/auto-reply/reply/get-reply.ts
index e6400464ed5..d2b47029934 100644
--- a/src/auto-reply/reply/get-reply.ts
+++ b/src/auto-reply/reply/get-reply.ts
@@ -82,7 +82,8 @@ export async function getReplyFromConfig(
   if (opts?.isHeartbeat) {
     // Prefer the resolved per-agent heartbeat model passed from the heartbeat runner,
     // fall back to the global defaults heartbeat model for backward compatibility.
-    const heartbeatRaw = opts.heartbeatModelOverride ?? agentCfg?.heartbeat?.model?.trim() ?? "";
+    const heartbeatRaw =
+      opts.heartbeatModelOverride?.trim() ?? agentCfg?.heartbeat?.model?.trim() ?? "";
     const heartbeatRef = heartbeatRaw
       ? resolveModelRefFromString({
           raw: heartbeatRaw,
diff --git a/src/browser/chrome.executables.ts b/src/browser/chrome.executables.ts
index 729127c9df9..d2b0206abd7 100644
--- a/src/browser/chrome.executables.ts
+++ b/src/browser/chrome.executables.ts
@@ -45,7 +45,11 @@ const CHROMIUM_DESKTOP_IDS = new Set([
   "opera.desktop",
   "opera-gx.desktop",
   "yandex-browser.desktop",
+  // Flatpak reverse-DNS desktop file IDs
+  "com.google.Chrome.desktop",
+  "com.brave.Browser.desktop",
   "org.chromium.Chromium.desktop",
+  "com.microsoft.Edge.desktop",
 ]);
 
 const CHROMIUM_EXE_NAMES = new Set([