diff --git a/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.cs b/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.cs
index 08ab6774c..d21ab08d9 100644
--- a/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.cs
+++ b/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.cs
@@ -14,7 +14,7 @@ namespace ClassicalSharp.Gui {
 		
 		Block[] blocksTable;
 		Texture blockInfoTexture;
-		const int blocksPerRow = 10, maxRows = 4;
+		const int blocksPerRow = 10, maxRows = 8;
 		int selIndex, rows;
 		int startX, startY, blockSize;
 		float selBlockExpand;
diff --git a/ClassicalSharp/Entities/LocalPlayer.cs b/ClassicalSharp/Entities/LocalPlayer.cs
index 23b94de5e..f3a0ddd6d 100644
--- a/ClassicalSharp/Entities/LocalPlayer.cs
+++ b/ClassicalSharp/Entities/LocalPlayer.cs
@@ -284,7 +284,8 @@ namespace ClassicalSharp.Entities {
 				}
 				
 				if( !anyHit ) {
-					spawn.Y = y + Entity.Adjustment;
+					byte block = collisions.GetPhysicsBlockId( P.X, y, P.Z );
+					spawn.Y = y + info.MaxBB[block].Y + Entity.Adjustment;
 					return;
 				}
 			}