diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12bc7a3..a15b799 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.16.0]
+
+- Fix issue #449 Discord RPC stuck on "Browsing Tidal".
+- Fix issue #448 Add option to disable the discord rpc idle text
+
 ## [5.15.0]
 
 - Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
diff --git a/package-lock.json b/package-lock.json
index ed9a725..faeb135 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tidal-hifi",
-  "version": "5.15.0",
+  "version": "5.16.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tidal-hifi",
-      "version": "5.15.0",
+      "version": "5.16.0",
       "license": "MIT",
       "dependencies": {
         "@electron/remote": "^2.1.2",
diff --git a/package.json b/package.json
index b2a06fd..d7878de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.15.0",
+  "version": "5.16.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -81,4 +81,4 @@
     "typescript": "^5.5.3"
   },
   "prettier": "@mastermindzh/prettier-config"
-}
\ No newline at end of file
+}
diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html
index 2e502a2..30e839b 100644
--- a/src/pages/settings/settings.html
+++ b/src/pages/settings/settings.html
@@ -468,7 +468,7 @@
           <h4>TIDAL Hi-Fi</h4>
           <div class="about-section__version">
             <a target="_blank" rel="noopener"
-              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.15.0">5.15.0</a>
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.16.0">5.16.0</a>
           </div>
           <div class="about-section__links">
             <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
@@ -491,4 +491,4 @@
   </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/scripts/discord.ts b/src/scripts/discord.ts
index 991c584..4a162a6 100644
--- a/src/scripts/discord.ts
+++ b/src/scripts/discord.ts
@@ -14,11 +14,7 @@ export let rpc: Client;
 
 const observer = () => {
   if (rpc) {
-    const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
-    if (mediaInfo.status === MediaStatus.paused && !showIdle) {
-      rpc.clearActivity();
-    } else
-    rpc.setActivity(getActivity());
+    updateActivity();
   }
 };
 
@@ -28,6 +24,15 @@ const defaultPresence = {
   instance: false,
 };
 
+const updateActivity = () => {
+  const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
+  if (mediaInfo.status === MediaStatus.paused && !showIdle) {
+    rpc.clearActivity();
+  } else {
+    rpc.setActivity(getActivity());
+  }
+};
+
 const getActivity = (): Presence => {
   const presence: Presence = { ...defaultPresence };
 
@@ -58,23 +63,33 @@ const getActivity = (): Presence => {
     return { includeTimestamps, detailsPrefix, buttonText };
   }
 
+  /**
+   * Pad a string using spaces to at least 2 characters
+   * @param input string to pad with 2 characters
+   * @returns
+   */
+  function pad(input: string): string {
+    return input.padEnd(2, " ");
+  }
+
   function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
+    // discord requires a minimum of 2 characters
+    const title = pad(mediaInfo.title);
+    const album = pad(mediaInfo.album);
+    const artists = pad(mediaInfo.artists);
+
     if (mediaInfo.url) {
-      presence.details = `${detailsPrefix}${mediaInfo.title}`;
-      presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)";
+      presence.details = `${detailsPrefix}${title}`;
+      presence.state = artists ? artists : "unknown artist(s)";
       presence.largeImageKey = mediaInfo.image;
-      if (mediaInfo.album) {
-        if (mediaInfo.album.length < 2) {  // Fix for DiscordRPC 2 character minimum
-          presence.largeImageText = mediaInfo.album + " ";
-        }
-        else {
-          presence.largeImageText = mediaInfo.album;
-        }
+      if (album) {
+        presence.largeImageText = album;
       }
+
       presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
     } else {
-      presence.details = `Watching ${mediaInfo.title}`;
-      presence.state = mediaInfo.artists;
+      presence.details = `Watching ${title}`;
+      presence.state = artists;
     }
   }
 
@@ -99,13 +114,13 @@ export const initRPC = () => {
   rpc.login({ clientId }).then(
     () => {
       rpc.on("ready", () => {
-        const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
-        if (mediaInfo.status === MediaStatus.paused && !showIdle) {
-          rpc.clearActivity();
-        } else
-        rpc.setActivity(getActivity());
+        updateActivity();
+      });
+
+      const { updateInfo, play, pause, playPause } = globalEvents;
+      [updateInfo, play, pause, playPause].forEach((status) => {
+        ipcMain.on(status, observer);
       });
-      ipcMain.on(globalEvents.updateInfo, observer);
     },
     () => {
       Logger.log("Can't connect to Discord, is it running?");
diff --git a/src/scripts/settings.ts b/src/scripts/settings.ts
index 0d78af9..4e5323a 100644
--- a/src/scripts/settings.ts
+++ b/src/scripts/settings.ts
@@ -116,6 +116,9 @@ export const settingsStore = new Store({
         { key: settings.advanced.tidalUrl, value: "https://listen.tidal.com" },
       ]);
     },
+    "5.16.0": (migrationStore) => {
+      buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
+    },
   },
 });