2 files changed, 26 insertions, 4 deletions
diff --git a/src/modules/launcher.tsx b/src/modules/launcher.tsx
index e3d3463..aeb7156 100644
--- a/src/modules/launcher.tsx
+++ b/src/modules/launcher.tsx
@@ -527,7 +527,7 @@ const Results = ({ entry, mode }: { entry: Widget.Entry; mode: Variable<Mode> })
                                                     c => c.class === "Todoist"
                                                 );
                                                 if (client) client.focus();
-                                                else Gio.DesktopAppInfo.new("todoist.desktop")?.launch([], null);
+                                                else execAsync("uwsm app -- todoist").catch(console.error);
                                             },
                                         },
                                     });
diff --git a/src/utils/system.ts b/src/utils/system.ts
index 1c5f011..c318c64 100644
--- a/src/utils/system.ts
+++ b/src/utils/system.ts
@@ -1,11 +1,33 @@
-import { execAsync, GLib } from "astal";
+import { execAsync, GLib, type Gio } from "astal";
 import type AstalApps from "gi://AstalApps";
 import { osIcons } from "./icons";
 
+/**
+ * See https://specifications.freedesktop.org/desktop-entry-spec/latest/exec-variables.html
+ * @param exec The exec field in a desktop file
+ */
+const execToCmd = (app: AstalApps.Application) => {
+    let exec = app.executable.replace(/%[fFuUdDnNvm]/g, ""); // Remove useless field codes
+    exec = exec.replace(/%i/g, app.iconName ? `--icon ${app.iconName}` : ""); // Replace %i app icon
+    exec = exec.replace(/%c/g, app.name); // Replace %c with app name
+    exec = exec.replace(/%k/g, (app.app as Gio.DesktopAppInfo).get_filename() ?? ""); // Replace %k with desktop file path
+    return exec;
+};
+
 export const launch = (app: AstalApps.Application) => {
+    let now = Date.now();
     execAsync(["uwsm", "app", "--", app.entry]).catch(() => {
-        app.frequency--; // Decrement frequency cause launch also increments it
-        app.launch();
+        // Try manual exec if launch fails (exits with error within 1 second)
+        if (Date.now() - now < 1000) {
+            now = Date.now();
+            execAsync(["uwsm", "app", "--", execToCmd(app)]).catch(() => {
+                // Fallback to regular launch
+                if (Date.now() - now < 1000) {
+                    app.frequency--; // Decrement frequency cause launch also increments it
+                    app.launch();
+                }
+            });
+        }
     });
     app.frequency++;
 };