diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java
index 21f870e..62d3df6 100644
--- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java
+++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java
@@ -14,6 +14,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
 import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreenList;
 
 import java.util.Collection;
 import java.util.List;
@@ -156,6 +157,11 @@ public abstract class AbstractSimiScreen extends Screen {
 				int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY();
 				graphics.renderComponentTooltip(font, tooltip, ttx, tty);
 			}
+
+			//Added
+			if (widget instanceof ModifiersScreenList list) {
+				list.renderWindowForeground(graphics, mouseX, mouseY, partialTicks);
+			}
 		}
 	}
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java
index 8c198f3..3944e90 100644
--- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java
+++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java
@@ -118,6 +118,8 @@ public class ScrollInput extends AbstractSimiWidget {
 
 	@Override
 	public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
+		if (!this.visible || !this.isHovered) return false; //Added
+
 		if (inverted)
 			delta *= -1;
 
@@ -147,7 +149,8 @@ public class ScrollInput extends AbstractSimiWidget {
 			onChanged();
 		}
 
-		return priorState != state;
+//		return priorState != state;
+		return true; //Changed
 	}
 
 	protected void clampState() {
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java
index e1ef346..44f1709 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java
@@ -31,8 +31,8 @@ public class LabeledScrollInput extends ScrollInput {
 
     //TODO: Check if this works
     @Override
-    public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
-        super.render(guiGraphics, mouseX, mouseY, partialTicks);
+    public void doRender(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+        super.doRender(guiGraphics, mouseX, mouseY, partialTicks);
 
         label.setX(getX() + width / 2 - Minecraft.getInstance().font.width(label.text) / 2);
         label.setY(getY() + height / 2 - Minecraft.getInstance().font.lineHeight / 2);