diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml
index 96dcbee2..6664e80a 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml	
@@ -8,8 +8,8 @@
     <string>C:\Documents and Settings\Branislav Stojkovic\Desktop</string>
   </entry>
   <entry>
-    <string>stickyPoints</string>
-    <boolean>true</boolean>
+    <string>autoCreatePads</string>
+    <boolean>false</boolean>
   </entry>
   <entry>
     <string>theme</string>
@@ -30,21 +30,25 @@
     </org.diylc.core.Theme>
   </entry>
   <entry>
-    <string>autoCreatePads</string>
-    <boolean>false</boolean>
+    <string>stickyPoints</string>
+    <boolean>true</boolean>
   </entry>
   <entry>
     <string>antiAliasing</string>
     <boolean>true</boolean>
   </entry>
   <entry>
-    <string>snapToGrid</string>
+    <string>continuousCreation</string>
     <boolean>true</boolean>
   </entry>
   <entry>
     <string>hiQualityRender</string>
     <boolean>false</boolean>
   </entry>
+  <entry>
+    <string>snapToGrid</string>
+    <boolean>true</boolean>
+  </entry>
   <entry>
     <string>showTemplatesAtStartup</string>
     <boolean>false</boolean>
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java
index 91aecc47..2d06dc7a 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java	
@@ -39,6 +39,7 @@ public interface IPlugInPort {
 	public static final String METRIC_KEY = "metric";
 	public static final String SNAP_TO_GRID_KEY = "snapToGrid";
 	public static final String AUTO_PADS_KEY = "autoCreatePads";
+	public static final String CONTINUOUS_CREATION_KEY = "continuousCreation";
 
 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java
index 3b5ffcc3..b07b761f 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java	
@@ -379,7 +379,12 @@ public class Presenter implements IPlugInPort {
 					LOG.error("Error instatiating component of type: "
 							+ componentTypeSlot.getInstanceClass().getName(), e);
 				}
-				setNewComponentTypeSlot(null);
+				if (ConfigurationManager.getInstance().readBoolean(
+						IPlugInPort.CONTINUOUS_CREATION_KEY, false)) {
+					setNewComponentTypeSlot(componentTypeSlot);
+				} else {
+					setNewComponentTypeSlot(null);
+				}
 				break;
 			case POINT_BY_POINT:
 				// First click is just to set the controlPointSlot and
@@ -411,7 +416,12 @@ public class Presenter implements IPlugInPort {
 					}
 					updateSelection(newSelection);
 					messageDispatcher.dispatchMessage(EventType.REPAINT);
-					setNewComponentTypeSlot(null);
+					if (ConfigurationManager.getInstance().readBoolean(
+							IPlugInPort.CONTINUOUS_CREATION_KEY, false)) {
+						setNewComponentTypeSlot(componentTypeSlot);
+					} else {
+						setNewComponentTypeSlot(null);
+					}
 				}
 				break;
 			default:
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/config/ConfigPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/config/ConfigPlugin.java
index 56a7c9bf..2bdad5d8 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/config/ConfigPlugin.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/config/ConfigPlugin.java	
@@ -50,6 +50,8 @@ public class ConfigPlugin implements IPlugIn {
 				"Snap to Grid", IPlugInPort.SNAP_TO_GRID_KEY, true), CONFIG_MENU);
 		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
 				"Auto-Create Pads", IPlugInPort.AUTO_PADS_KEY, false), CONFIG_MENU);
+		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
+				"Continuous Creation", IPlugInPort.CONTINUOUS_CREATION_KEY, false), CONFIG_MENU);
 		File themeDir = new File("themes");
 		if (themeDir.exists()) {
 			XStream xStream = new XStream(new DomDriver());
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml
index e42485fc..f2242336 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml	
@@ -252,6 +252,10 @@
 					<changeType>NEW_FEATURE</changeType>
 					<description>Auto-create solder pads</description>
 				</com.diyfever.gui.update.Change>
+				<com.diyfever.gui.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>Continuous component creation</description>
+				</com.diyfever.gui.update.Change>
 			</changes>
 			<url>http://code.google.com/p/diy-layout-creator/downloads/list
 			</url>