diff --git a/GUI/Popups/TokenSelector.cs b/GUI/Popups/TokenSelector.cs
index 8ab5bcb26..503166fb8 100644
--- a/GUI/Popups/TokenSelector.cs
+++ b/GUI/Popups/TokenSelector.cs
@@ -25,7 +25,7 @@ namespace MCGalaxy.Gui.Popups {
         }
         
         
-        const int btnWidth = 130, btnHeight = 40, btnsPerCol = 8;
+        const int btnWidth = 110, btnHeight = 40, btnsPerCol = 9;
         int index = 0;
         void MakeButton(ChatToken token) {
             int row = index / btnsPerCol, col = index % btnsPerCol;
diff --git a/MCGalaxy/Commands/CPE/CustomBlockCommand.cs b/MCGalaxy/Commands/CPE/CustomBlockCommand.cs
index de59efa6b..aba6bbadd 100644
--- a/MCGalaxy/Commands/CPE/CustomBlockCommand.cs
+++ b/MCGalaxy/Commands/CPE/CustomBlockCommand.cs
@@ -313,7 +313,7 @@ namespace MCGalaxy.Commands.CPE {
             
             if (def == null && block.BlockID < Block.CpeCount) {
                 def = DefaultSet.MakeCustomBlock(block.BlockID);
-                AddBlock(p, def, global, cmd, BlockDefinition.GlobalProps[block.Index]);
+                AddBlock(p, def, global, cmd, BlockDefinition.DefaultProps(block));
             }
             if (!ExistsInScope(def, block, global)) { MessageNoBlock(p, block, global, cmd); return; }