diff --git a/src/tools/trackeditor/gui/CheckDialog.java b/src/tools/trackeditor/gui/CheckDialog.java
index a0b49877c..c0b471564 100644
--- a/src/tools/trackeditor/gui/CheckDialog.java
+++ b/src/tools/trackeditor/gui/CheckDialog.java
@@ -1194,9 +1194,13 @@ public class CheckDialog extends JDialog
 		{
 			checkTrackObject(trackData.getObjects().get(i), "Track");
 		}
-		for (int i = 0; i < defaultObjects.size(); i++)
+
+		if (editorFrame.getCheckDefaultObjects())
 		{
-			checkTrackObject(defaultObjects.get(i), "Default");
+			for (int i = 0; i < defaultObjects.size(); i++)
+			{
+				checkTrackObject(defaultObjects.get(i), "Default");
+			}
 		}
 	}
 	private File findTextureFile(String texture)
diff --git a/src/tools/trackeditor/gui/EditorFrame.java b/src/tools/trackeditor/gui/EditorFrame.java
index 71db3d521..dfeebc938 100644
--- a/src/tools/trackeditor/gui/EditorFrame.java
+++ b/src/tools/trackeditor/gui/EditorFrame.java
@@ -246,6 +246,8 @@ public class EditorFrame extends JFrame
 	private final static String	CURSOR_COORDINATES					= "CursorCoordinates";
 	private boolean				cursorNames							= false;
 	private final static String	CURSOR_NAMES						= "CursorNames";
+	private boolean				checkDefaultObjects					= false;
+	private final static String	CHECK_DEFAULT_OBJECTS				= "CheckDefaultObjects";
 	
 	private TrackData			trackData							= null;
 	private Vector<Surface>		defaultSurfaces						= new Vector<Surface>();
@@ -388,6 +390,7 @@ public class EditorFrame extends JFrame
 		interactiveFixes = preferences.getBoolean(INTERACTIVE_FIXES, false);
 		cursorCoordinates = preferences.getBoolean(CURSOR_COORDINATES, false);
 		cursorNames = preferences.getBoolean(CURSOR_NAMES, false);
+		checkDefaultObjects = preferences.getBoolean(CHECK_DEFAULT_OBJECTS, false);
 
 		if (dataDirectory == null)
 		{
@@ -546,6 +549,18 @@ public class EditorFrame extends JFrame
 		preferences.putBoolean(CURSOR_NAMES, cursorNames);
 	}
 
+	public boolean getCheckDefaultObjects()
+	{
+		return checkDefaultObjects;
+	}
+
+	public void setCheckDefaultObjects(boolean value)
+	{
+		checkDefaultObjects = value;
+
+		preferences.putBoolean(CHECK_DEFAULT_OBJECTS, checkDefaultObjects);
+	}
+
 	private void updateRecentFiles(String filename)
 	{
 		recentFiles.remove(filename);
@@ -1410,6 +1425,7 @@ public class EditorFrame extends JFrame
 			setInteractiveFixes(preferencesDialog.getInteractiveFixes());
 			setCursorCoordinates(preferencesDialog.getCursorCoordinates());
 			setCursorNames(preferencesDialog.getCursorNames());
+			setCheckDefaultObjects(preferencesDialog.getCheckDefaultObjects());
 			readDefaultSurfaces();
 			readDefaultObjects();
 			view.redrawCircuit();
diff --git a/src/tools/trackeditor/gui/PreferencesDialog.java b/src/tools/trackeditor/gui/PreferencesDialog.java
index ea3c219db..9c580517e 100644
--- a/src/tools/trackeditor/gui/PreferencesDialog.java
+++ b/src/tools/trackeditor/gui/PreferencesDialog.java
@@ -35,6 +35,7 @@ public class PreferencesDialog extends JDialog
 	private JCheckBox			interactiveFixesCheckBox	= null;
 	private JCheckBox			cursorCoordinatesCheckBox	= null;
 	private JCheckBox			cursorNamesCheckBox			= null;
+	private JCheckBox			checkDefaultObjectsCheckBox	= null;
 	private JButton				okButton					= null;
 	private JButton				cancelButton				= null;
 
@@ -98,6 +99,7 @@ public class PreferencesDialog extends JDialog
 			jPanel.add(getInteractiveFixesCheckBox(), null);
 			jPanel.add(getCursorCoordinatesCheckBox(), null);
 			jPanel.add(getCursorNamesCheckBox(), null);
+			jPanel.add(getCheckDefaultObjectsCheckBox(), null);
 			jPanel.add(getOkButton(), null);
 			jPanel.add(getCancelButton(), null);
 		}
@@ -301,6 +303,18 @@ public class PreferencesDialog extends JDialog
 		return cursorNamesCheckBox;
 	}
 
+	private JCheckBox getCheckDefaultObjectsCheckBox()
+	{
+		if (checkDefaultObjectsCheckBox == null)
+		{
+			checkDefaultObjectsCheckBox = new JCheckBox();
+			checkDefaultObjectsCheckBox.setBounds(200, 205, 290, 23);
+			checkDefaultObjectsCheckBox.setText("Check Default Objects");
+			checkDefaultObjectsCheckBox.setSelected(editorFrame.getCheckDefaultObjects());
+		}
+		return checkDefaultObjectsCheckBox;
+	}
+
 	private JButton getOkButton()
 	{
 		if (okButton == null)
@@ -394,6 +408,11 @@ public class PreferencesDialog extends JDialog
 		return getCursorNamesCheckBox().isSelected();
 	}
 
+	public boolean getCheckDefaultObjects()
+	{
+		return getCheckDefaultObjectsCheckBox().isSelected();
+	}
+
 	protected void processWindowEvent(WindowEvent e)
 	{
 		super.processWindowEvent(e);
diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java
index 8afdd8c6f..679e1b91a 100644
--- a/src/tools/trackeditor/utils/Properties.java
+++ b/src/tools/trackeditor/utils/Properties.java
@@ -34,7 +34,7 @@ public  class Properties
 	private static Properties	instance				= new Properties();
 	private Vector<ActionListener>	propertiesListeners	= new Vector<ActionListener>();
 	public final String			title					= "sd2-trackeditor";
-	public final String			version					= "1.4.50";
+	public final String			version					= "1.4.51";
 	private String				path;
 
 	private double				imageScale				= 1;