diff --git a/OpenFlipper/widgets/optionsWidget/optionsWidget.cc b/OpenFlipper/widgets/optionsWidget/optionsWidget.cc
index a89b8a7510e3ff0d1877a1dbf48b69405e17e6d7..5ac32fd1413ac5fc280c9be03196c8ccc4f9ffd3 100644
--- a/OpenFlipper/widgets/optionsWidget/optionsWidget.cc
+++ b/OpenFlipper/widgets/optionsWidget/optionsWidget.cc
@@ -273,6 +273,8 @@ void OptionsWidget::showEvent ( QShowEvent * /*event*/ ) {
   maxRecentBox->setValue( OpenFlipperSettings().value("Core/File/MaxRecent",15).toInt() );
   rbReloadShaders->setChecked(OpenFlipperSettings().value("Core/File/ReloadShaders",false).toBool()) ;
   leShaderOutputDir->setText(OpenFlipperSettings().value("Core/File/ShaderOutputDir","").toString());
+  allTarget->setChecked( OpenFlipperSettings().value("Core/File/AllTarget",false).toBool() );
+
 
   // UI settings
   toolBoxOrientation->setCurrentIndex((OpenFlipperSettings().value("Core/Gui/ToolBoxes/ToolBoxOnTheRight",true).toBool() ? 0 : 1));
@@ -584,6 +586,8 @@ void OptionsWidget::slotApply() {
   OpenFlipperSettings().setValue("Core/File/ShaderOutputDir",leShaderOutputDir->text() ) ;
   ACG::ShaderCache::getInstance()->setDebugOutputDir(leShaderOutputDir->text().toUtf8());
 
+  OpenFlipperSettings().setValue("Core/File/AllTarget",allTarget->isChecked());
+
   
   // Toolbox orientation
   OpenFlipperSettings().setValue("Core/Gui/ToolBoxes/ToolBoxOnTheRight", (toolBoxOrientation->currentIndex() == 0));
diff --git a/OpenFlipper/widgets/optionsWidget/optionsWidget.ui b/OpenFlipper/widgets/optionsWidget/optionsWidget.ui
index b6278e7e4bd2c12ad1d3af0edcf0d71eef9a1988..0028d16bfb36944e6a5230466dad5c56cba270a6 100644
--- a/OpenFlipper/widgets/optionsWidget/optionsWidget.ui
+++ b/OpenFlipper/widgets/optionsWidget/optionsWidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>699</width>
+    <width>702</width>
     <height>700</height>
    </rect>
   </property>
@@ -36,8 +36,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>662</width>
-        <height>862</height>
+        <width>721</width>
+        <height>957</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -50,7 +50,7 @@
           <string/>
          </property>
          <property name="currentIndex">
-          <number>1</number>
+          <number>0</number>
          </property>
          <property name="usesScrollButtons">
           <bool>true</bool>
@@ -412,6 +412,35 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_15">
+             <property name="title">
+              <string>General Object Options</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_27">
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_26">
+                <item>
+                 <widget class="QCheckBox" name="allTarget">
+                  <property name="toolTip">
+                   <string>The add empty object functions will set all new objects to be target by default</string>
+                  </property>
+                  <property name="statusTip">
+                   <string>The add empty object functions will set all new objects to be target by default</string>
+                  </property>
+                  <property name="whatsThis">
+                   <string>The add empty object functions will set all new objects to be target by default</string>
+                  </property>
+                  <property name="text">
+                   <string>Set all newly added objects to target</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <spacer name="verticalSpacer_5">
              <property name="orientation">