diff --git a/public/Program Files/eSheep/eSheep.js b/public/Program Files/eSheep/eSheep.js
index 9dfd6273..544666eb 100644
--- a/public/Program Files/eSheep/eSheep.js	
+++ b/public/Program Files/eSheep/eSheep.js	
@@ -382,7 +382,7 @@ window.Sheep = class eSheep {
     let margin = 20;
     if (this.HTMLelement) margin = 5;
     for (const index in this.userOptions.collisionsWith) {
-      const els = document.body.getElementsByTagName(
+      const els = document.body.querySelectorAll(
         this.userOptions.collisionsWith[index]
       );
 
diff --git a/utils/spawnSheep.ts b/utils/spawnSheep.ts
index f18a5061..aea71138 100644
--- a/utils/spawnSheep.ts
+++ b/utils/spawnSheep.ts
@@ -48,7 +48,11 @@ export const spawnSheep = (pickRandom?: boolean): Promise<void> =>
     if (window.Sheep) {
       const sheep = new window.Sheep({
         allowPopup: "no",
-        collisionsWith: ["nav", "section"],
+        collisionsWith: [
+          "#__next main > nav", // Taskbar
+          ".react-draggable section", // Windows
+          "#webamp .window", // Webamp Windows
+        ],
         footerMargin: TASKBAR_HEIGHT,
         spawnContainer: document.querySelector("main") as HTMLElement,
       });