diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 9a30317d22..7bdb830d14 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -1588,7 +1588,7 @@ public class Blocks implements ContentList{
         //endregion
         //region units
 
-        BooleanProvider padVisible = () -> state.rules.attackMode || state.rules.pvp;
+        BooleanProvider padVisible = () -> state.rules.attackMode || state.rules.pvp || state.isEditor();
 
         spiritFactory = new UnitFactory("spirit-factory"){{
             requirements(Category.units, ItemStack.with(Items.copper, 70, Items.lead, 110, Items.silicon, 80));
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
index 90bcd05dd6..652c4ae1c3 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
@@ -142,7 +142,7 @@ public class PlacementFragment extends Fragment{
 
                         ImageButton button = blockTable.addImageButton("icon-locked", "select", 8 * 4, () -> {
                             if(unlocked(block)){
-                                input.block = block;
+                                input.block = input.block == block ? null : block;
                             }
                         }).size(46f).group(group).get();