diff --git a/src/main/java/team/chisel/client/gui/GuiScrollbar.java b/src/main/java/team/chisel/client/gui/GuiScrollbar.java
index 87cb0a21..7854f983 100644
--- a/src/main/java/team/chisel/client/gui/GuiScrollbar.java
+++ b/src/main/java/team/chisel/client/gui/GuiScrollbar.java
@@ -78,8 +78,8 @@ public class GuiScrollbar {
 
         if (x > displayX && x <= displayX + width) {
             if (y > displayY && y <= displayY + scrollHeight) {
-                int currentScroll = (y - displayY);
-                currentScroll = Math.round(1.0f * currentScroll / scrollHeight) * getMaxScroll();
+                int currentScroll = (y - displayY - height / 2);
+                currentScroll = Math.round(1.0f * currentScroll * getMaxScroll() / (scrollHeight - height));
                 setCurrentScroll(applyRange(currentScroll));
             }
         }
diff --git a/src/main/java/team/chisel/inventory/InventoryChiselSelection.java b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java
index 80946745..adab8d9f 100644
--- a/src/main/java/team/chisel/inventory/InventoryChiselSelection.java
+++ b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java
@@ -141,13 +141,7 @@ public class InventoryChiselSelection implements IInventory {
 		if (!((IChiselItem) chisel.getItem()).canChisel(container.playerInventory.player.worldObj, chisel, General.getVariation(chiseledItem)))
 			return;
 
-		List<ItemStack> list2 = container.carving.getItemsForChiseling(chiseledItem);
-		// DEBUG! REMOVE:
-		List<ItemStack> list = new ArrayList<>(list2);
-		list.addAll(list2);
-		if (list.size() > 61) {
-			list = list.subList(0, 61);
-		}
+		List<ItemStack> list = container.carving.getItemsForChiseling(chiseledItem);
 		maxScroll = list.size();
 		int activeVariations = 0;
 		while (activeVariations < normalSlots && activeVariations + currentScroll < list.size()) {