diff --git a/modules/desktop/electron/libs/push-notification.ts b/modules/desktop/electron/libs/push-notification.ts
index a591b89..4ee013b 100644
--- a/modules/desktop/electron/libs/push-notification.ts
+++ b/modules/desktop/electron/libs/push-notification.ts
@@ -21,7 +21,7 @@ const readFile = promisify(fs.readFile);
 const writeFile = promisify(fs.writeFile);
 
 export default function initialize(mainWindow: BrowserWindow) {
-  if (config.PUSHY_APP_ID) {
+  if (config.PUSHY_APP_ID && process.env.NODE_ENV !== "test") {
     Pushy.listen();
     // Register device for push notifications
     Pushy.register({ appId: config.PUSHY_APP_ID })
diff --git a/modules/desktop/package.json b/modules/desktop/package.json
index e6f8ca0..16ce6ed 100644
--- a/modules/desktop/package.json
+++ b/modules/desktop/package.json
@@ -29,7 +29,7 @@
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --compiler-warnings \"css-unused-selector:ignore\" --watch",
     "lint": "prettier --check . && eslint .",
     "format": "prettier --write .",
-    "e2e": "wdio run ./wdio.conf.ts"
+    "e2e": "NODE_ENV=test wdio run ./wdio.conf.ts"
   },
   "devDependencies": {
     "@electron/notarize": "^1.2.3",
diff --git a/modules/desktop/src/components/package-banner/package-banner.svelte b/modules/desktop/src/components/package-banner/package-banner.svelte
index 466a5c2..8bc86c6 100644
--- a/modules/desktop/src/components/package-banner/package-banner.svelte
+++ b/modules/desktop/src/components/package-banner/package-banner.svelte
@@ -159,7 +159,7 @@
                 </div>
               </Button>
               <div slot="tooltip-content" class="flex flex-col items-center">
-                <div>Removes {pkg.installed_versions?.length ?? 0 - 1} old versions</div>
+                <div>Removes {(pkg.installed_versions?.length || 0) - 1} old versions</div>
                 <div>Keeps latest (v{findRecentInstalledVersion(pkg)})</div>
               </div>
             </ToolTip>
diff --git a/modules/desktop/src/components/package-install-button/package-install-button.svelte b/modules/desktop/src/components/package-install-button/package-install-button.svelte
index 882b270..217378f 100644
--- a/modules/desktop/src/components/package-install-button/package-install-button.svelte
+++ b/modules/desktop/src/components/package-install-button/package-install-button.svelte
@@ -6,6 +6,8 @@
   export let buttonSize: "small" | "large" = "small";
 
   export let pkg: GUIPackage;
+  export let activeVersion = ""; // determine which version is being installed
+
   export let onClick = (evt?: MouseEvent) => {
     console.log("do nothing");
   };
@@ -25,6 +27,7 @@
   };
 
   const getVersion = (pkg: GUIPackage) => {
+    if (pkg.state === PackageStates.INSTALLING && activeVersion) return activeVersion;
     if (pkg.state === PackageStates.INSTALLED) {
       return pkg.installed_versions?.[0] ?? pkg.version;
     }
diff --git a/modules/desktop/src/components/package-install-button/package-version-selector.svelte b/modules/desktop/src/components/package-install-button/package-version-selector.svelte
index 4eec445..be29e8a 100644
--- a/modules/desktop/src/components/package-install-button/package-version-selector.svelte
+++ b/modules/desktop/src/components/package-install-button/package-version-selector.svelte
@@ -30,6 +30,7 @@
     (a: string, b: string) => semverCompare(b, a)
   );
 
+  let activeVersion = "";
   const handleClick = (evt: MouseEvent, version: string) => {
     if (isInstalled(version)) {
       return;
@@ -37,6 +38,7 @@
 
     isOpened = false;
     if (version) {
+      activeVersion = version;
       onClick(version);
     }
   };
@@ -45,7 +47,7 @@
 </script>
 
 <div class="dropdown z-10" use:clickOutside on:click_outside={handleClickOutside}>
-  <PackageStateButton {buttonSize} {pkg} onClick={toggleOpen}>
+  <PackageStateButton {buttonSize} {pkg} onClick={toggleOpen} {activeVersion}>
     <div slot="selector" class="pt-2">
       <div class="version-list" class:visible={isOpened}>
         {#each allVersions as version, idx}