diff --git a/src/Disp/Tooltips/TypesOfTooltips/Upgrade.js b/src/Disp/Tooltips/TypesOfTooltips/Upgrade.js
index ca2cd11..8cfd654 100644
--- a/src/Disp/Tooltips/TypesOfTooltips/Upgrade.js
+++ b/src/Disp/Tooltips/TypesOfTooltips/Upgrade.js
@@ -45,29 +45,32 @@ export default function Upgrade() {
       }
       l('CMTooltipBorder').className =
         ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
-      // If clicking power upgrade
-      if (TooltipBonusMouse) {
-        l('CMTooltipCookiePerClick').textContent = Beautify(TooltipBonusMouse);
-        l('CMTooltipCookiePerClick').style.display = 'block';
-        l('CMTooltipCookiePerClick').previousSibling.style.display = 'block';
-      }
-      // If only a clicking power upgrade change PP to click-based period
-      if (TooltipBonusIncome === 0 && TooltipBonusMouse) {
-        l('CMTooltipPP').textContent = `${Beautify(TooltipPrice / TooltipBonusMouse)} Clicks`;
-        l('CMTooltipPP').style.color = 'white';
-      } else {
-        if (CMOptions.PPDisplayTime)
-          l('CMTooltipPP').textContent = FormatTime(
-            CacheUpgrades[Game.UpgradesInStore[TooltipName].name].pp,
-          );
-        else
-          l('CMTooltipPP').textContent = Beautify(
-            CacheUpgrades[Game.UpgradesInStore[TooltipName].name].pp,
-            2,
-          );
-        l('CMTooltipPP').className =
-          ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
-      }
+    }
+
+    // If clicking power upgrade
+    if (TooltipBonusMouse) {
+      l('CMTooltipCookiePerClick').textContent = Beautify(TooltipBonusMouse);
+      l('CMTooltipCookiePerClick').style.display = 'block';
+      l('CMTooltipCookiePerClick').previousSibling.style.display = 'block';
+    }
+    // If only a clicking power upgrade change PP to click-based period
+    if (!TooltipBonusIncome && TooltipBonusMouse) {
+      l('CMTooltipPP').textContent = `${Beautify(TooltipPrice / TooltipBonusMouse)} Clicks`;
+      l('CMTooltipPP').style.color = 'white';
+      l('Payback PeriodTitle').style.display = 'block';
+      l('CMTooltipPP').style.display = 'block';
+    } else {
+      if (CMOptions.PPDisplayTime)
+        l('CMTooltipPP').textContent = FormatTime(
+          CacheUpgrades[Game.UpgradesInStore[TooltipName].name].pp,
+        );
+      else
+        l('CMTooltipPP').textContent = Beautify(
+          CacheUpgrades[Game.UpgradesInStore[TooltipName].name].pp,
+          2,
+        );
+      l('CMTooltipPP').className =
+        ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
     }
     const timeColour = GetTimeColour(
       (TooltipPrice - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),