diff --git a/ClassicalSharp/2D/Screens/BlockSelectScreen.cs b/ClassicalSharp/2D/Screens/BlockSelectScreen.cs
index 89376d11a..69c648e60 100644
--- a/ClassicalSharp/2D/Screens/BlockSelectScreen.cs
+++ b/ClassicalSharp/2D/Screens/BlockSelectScreen.cs
@@ -197,7 +197,7 @@ namespace ClassicalSharp {
 		void RecreateBlockTable() {
 			int blocksCount = 0;
 			for( int tile = 1; tile < BlockInfo.BlocksCount; tile++ ) {
-				if( game.Inventory.CanPlace[tile] || game.Inventory.CanDelete[tile] )
+				if( tile < BlockInfo.CpeBlocksCount || game.BlockInfo.Name[tile] != "Invalid" )
 					blocksCount++;
 			}
 			
@@ -208,7 +208,7 @@ namespace ClassicalSharp {
 			
 			int tableIndex = 0;
 			for( int tile = 1; tile < BlockInfo.BlocksCount; tile++ ) {
-				if( game.Inventory.CanPlace[tile] || game.Inventory.CanDelete[tile] )
+				if( tile < BlockInfo.CpeBlocksCount || game.BlockInfo.Name[tile] != "Invalid" )
 					blocksTable[tableIndex++] = (Block)tile;
 			}
 		}