diff --git a/README.md b/README.md
index 693054f7..14b92868 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# BetterDiscord [![Language Grade][lgtm-badge]][lgtm-link] ![GitHub Releases][downloads-badge] [![Patreon][patreon-badge]][patreon-link] [![Paypal][paypal-badge]][paypal-link]
+# BetterDiscord [![Language Grade][lgtm-badge]][lgtm-link] ![GitHub Releases][downloads-badge]
 
 [patreon-badge]: https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3DZerebos%26type%3Dpatrons&style=flat-square
 [patreon-link]: https://patreon.com/Zerebos
diff --git a/injector/src/index.js b/injector/src/index.js
index 7abb0df8..b38b5ebd 100644
--- a/injector/src/index.js
+++ b/injector/src/index.js
@@ -31,3 +31,8 @@ if (process.platform == "win32" || process.platform == "darwin") {
     Module._load(path.join(basePath, pkg.main), null, true);
 }
 
+// Needs to run this after Discord but before ready()
+if (!process.argv.includes("--vanilla")) {
+    const BetterDiscord = require("./modules/betterdiscord").default;
+    BetterDiscord.disableMediaKeys();
+}
\ No newline at end of file
diff --git a/injector/src/modules/betterdiscord.js b/injector/src/modules/betterdiscord.js
index 3edf25e6..74cb0b66 100644
--- a/injector/src/modules/betterdiscord.js
+++ b/injector/src/modules/betterdiscord.js
@@ -111,6 +111,12 @@ export default class BetterDiscord {
             hasCrashed = true;
         });
     }
+
+    static disableMediaKeys() {
+        if (!BetterDiscord.getSetting("general", "mediaKeys")) return;
+        const originalDisable = electron.app.commandLine.getSwitchValue("disable-features") || "";
+        electron.app.commandLine.appendSwitch("disable-features", `${originalDisable ? "," : ""}HardwareMediaKeyHandling,MediaSessionService`);
+    }
 }
 
 if (BetterDiscord.getSetting("developer", "reactDevTools")) {
@@ -118,7 +124,3 @@ if (BetterDiscord.getSetting("developer", "reactDevTools")) {
         await ReactDevTools.install();
     });
 }
-
-if (BetterDiscord.getSetting("general", "mediaKeys")) {
-    electron.app.commandLine.appendSwitch("disable-features", "HardwareMediaKeyHandling,MediaSessionService");
-}
diff --git a/renderer/src/modules/discordmodules.js b/renderer/src/modules/discordmodules.js
index 527afc0b..809cfad9 100644
--- a/renderer/src/modules/discordmodules.js
+++ b/renderer/src/modules/discordmodules.js
@@ -149,8 +149,8 @@ export default Utilities.memoizeObject({
         const guildsWrapper = WebpackModules.getByProps("base", "guilds");
         const guilds = WebpackModules.getByProps("wrapper", "acronym");
         const pill = WebpackModules.getByProps("circleIconButton");
-        const listItem = WebpackModules.getModule(m => m.listItem && !m.pill);
-        return Object.assign({}, guildsWrapper, listItem, guilds, pill);
+        const listItem = WebpackModules.getModule(m => m.listItem && !m.pill && !m.sidebar);
+        return Object.assign({}, guildsWrapper, guilds, pill, listItem);
     },
 
     get LayerStack() {return WebpackModules.getByProps("pushLayer");}