diff --git a/main.js b/main.js
index 10cac1a842bb..73c5c5fe7476 100644
--- a/main.js
+++ b/main.js
@@ -46,6 +46,8 @@ let tray = null;
 const startInTray = process.argv.some(arg => arg === '--start-in-tray');
 const usingTrayIcon =
   startInTray || process.argv.some(arg => arg === '--use-tray-icon');
+const disableFlashFrame =
+  startInTray || process.argv.some(arg => arg === '--disable-flash-frame');
 
 const config = require('./app/config');
 
@@ -906,7 +908,14 @@ ipc.on('add-setup-menu-items', () => {
 });
 
 ipc.on('draw-attention', () => {
-  if (process.platform === 'win32' && mainWindow) {
+  if (!mainWindow) {
+    return;
+  }
+  if (disableFlashFrame) {
+    return;
+  }
+
+  if (process.platform === 'win32' || process.platform === 'linux') {
     mainWindow.flashFrame(true);
   }
 });
diff --git a/package.json b/package.json
index bed1a095712c..b8092e63b21f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "signal-desktop",
   "productName": "Signal",
   "description": "Private messaging from your desktop",
-  "desktopName": "signal-desktop.desktop",
+  "desktopName": "signal.desktop",
   "repository": "https://github.com/signalapp/Signal-Desktop.git",
   "version": "1.27.3-beta.2",
   "license": "GPL-3.0",