diff --git a/com.github.devalien.workspaces.json b/com.github.devalien.workspaces.json
index f8dfecd..90a7c14 100644
--- a/com.github.devalien.workspaces.json
+++ b/com.github.devalien.workspaces.json
@@ -5,7 +5,7 @@
     "sdk": "org.freedesktop.Sdk",
     "base": "io.elementary.BaseApp",
     "base-version": "juno-19.08",
-    "command": "com.github.devalien.workspaces",
+    "command": "workspaces-wrapper",
     "finish-args": [
         "--share=ipc",
         "--socket=fallback-x11",
@@ -26,6 +26,24 @@
         "*.a"
     ],
     "modules": [
+        {
+            "name": "wrapper",
+            "buildsystem": "simple",
+            "build-commands": [
+                "install -m755 workspaces-wrapper /app/bin"
+            ],
+            "sources": [
+                {
+                    "type": "script",
+                    "dest-filename": "workspaces-wrapper",
+                    "commands": [
+                        "export PATH=$PATH:/run/host/usr/bin",
+                        "export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/host/usr/share",
+                        "com.github.devalien.workspaces"
+                    ]
+                }
+            ]
+        },
         {
             "name": "Workspaces",
             "buildsystem": "meson",
@@ -35,6 +53,9 @@
                     "url": "https://github.com/devalien/workspaces.git",
                     "branch": "master"
                 }
+            ],
+            "post-install": [
+                "sed -i s:Exec=data/com.github.devalien.workspaces:Exec=/app/bin/workspaces-wrapper: /app/share/applications/com.github.devalien.workspaces.desktop"
             ]
         }
     ]