diff --git a/src/main/java/io/github/prospector/modmenu/gui/EntryListWidget.java b/src/main/java/io/github/prospector/modmenu/gui/EntryListWidget.java
index 26107ba4c..f46162a81 100644
--- a/src/main/java/io/github/prospector/modmenu/gui/EntryListWidget.java
+++ b/src/main/java/io/github/prospector/modmenu/gui/EntryListWidget.java
@@ -334,7 +334,7 @@ public boolean mouseReleased(double d, double e, int i) {
 
 	double oldY = -1;
 	public boolean mouseDragged(double mouseX, double mouseY, int mouseButton, double mouseDX, double mouseDY) {
-		if (mouseButton == 0) {
+		if (mouseButton == 0 && isMouseOver(mouseX, mouseY)) {
 			setScrollAmount(getScrollAmount() - mouseY + oldY);
 			return true;
 		} else {
diff --git a/src/main/java/io/github/prospector/modmenu/gui/ModListScreen.java b/src/main/java/io/github/prospector/modmenu/gui/ModListScreen.java
index 26a98924a..a0fdd83b9 100644
--- a/src/main/java/io/github/prospector/modmenu/gui/ModListScreen.java
+++ b/src/main/java/io/github/prospector/modmenu/gui/ModListScreen.java
@@ -166,7 +166,7 @@ public void render(Minecraft mc, int int_1, int int_2) {
 		this.buttons.add(new Button(TOGGLE_SORT_MODE_BUTTON_ID, filtersX, 45, sortingWidth, 20, sortingText) {
 			@Override
 			public void render(Minecraft mc, int mouseX, int mouseY) {
-				visible = filterOptionsShown; // visible = filterOptionsShown
+				visible = active = filterOptionsShown;
 				this.text = "Sort: " + ModMenuConfigManager.getConfig().getSorting().getName();
 				super.render(mc, mouseX, mouseY);
 			}
@@ -174,7 +174,7 @@ public void render(Minecraft mc, int mouseX, int mouseY) {
 		this.buttons.add(new Button(TOGGLE_SHOW_LIBRARIES_BUTTON_ID, filtersX + sortingWidth + 2, 45, showLibrariesWidth, 20, showLibrariesText) {
 			@Override
 			public void render(Minecraft mc, int mouseX, int mouseY) {
-				visible = filterOptionsShown; // visible = filterOptionsShown
+				visible = active = filterOptionsShown;
 				this.text = ModMenuConfigManager.getConfig().showLibraries() ? "Libraries: Shown" : "Libraries: Hidden";
 				super.render(mc, mouseX, mouseY);
 			}