diff --git a/Templates/BaseGame/game/tools/shapeEditor/main.tscript b/Templates/BaseGame/game/tools/shapeEditor/main.tscript
index 21516fb48..8877863e0 100644
--- a/Templates/BaseGame/game/tools/shapeEditor/main.tscript
+++ b/Templates/BaseGame/game/tools/shapeEditor/main.tscript
@@ -323,7 +323,7 @@ function ShapeEditorPlugin::onExitMission( %this )
 {
    // unselect the current shape
    ShapeEdShapeView.setModel( "" );
-   if (ShapeEditor.shape != 0)
+   if (ShapeEditor.shape != 0 && ShapeEditor.shape != -1)
       ShapeEditor.shape.delete();
    ShapeEditor.shape = 0;
    ShapeEdUndoManager.clearAll();
diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
index 1af096387..5058099fb 100644
--- a/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
+++ b/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
@@ -893,7 +893,7 @@ function ObjectBuilderGui::createCommandType(%this, %index)
       text = %this.field[%index, value];
       position = %this.curXPos + %this.columnOffset @ " " @ %this.curYPos;
       modal = "1";
-      command = "TextPad($ThisControl.text, \"$ThisControl.apply\", $ThisControl.getRoot());";
+      command = "TextPad($ThisControl.text, $ThisControl@\".apply\", $ThisControl.getRoot());";
    };
    
    %this.numControls++;