diff --git a/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp b/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp
index 6eba15039..d357ae1fd 100644
--- a/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp
+++ b/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp
@@ -1,7 +1,7 @@
 /****************************************************************
- * This file is distributed under the following license:
- *
- * Copyright (c) 2006-2007, crypton
+ * This file is distributed under the following license:
+ *
+ * Copyright (c) 2006-2007, crypton
  * Copyright (c) 2006, Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
@@ -35,17 +35,7 @@ GeneralDialog::GeneralDialog(QWidget *parent)
  /* Create RshareSettings object */
   _settings = new RshareSettings();
   
-  if (QSystemTrayIcon::isSystemTrayAvailable()){
 
-    /* Check if we are supposed to show our main window on startup */
-    ui.chkShowOnStartup->setChecked(_settings->showMainWindowAtStart());
-    if (ui.chkShowOnStartup->isChecked())
-      show();
-  } else {
-    /* Don't let people hide the main window, since that's all they have. */
-    ui.chkShowOnStartup->hide();
-    show();
-  }
   /* Hide platform specific features */
 #ifndef Q_WS_WIN
   ui.chkRunRetroshareAtSystemStartup->setVisible(false);
diff --git a/retroshare-gui/src/gui/Preferences/GeneralDialog.ui b/retroshare-gui/src/gui/Preferences/GeneralDialog.ui
index b5051d04d..6c159e01d 100644
--- a/retroshare-gui/src/gui/Preferences/GeneralDialog.ui
+++ b/retroshare-gui/src/gui/Preferences/GeneralDialog.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>431</width>
-    <height>250</height>
+    <width>413</width>
+    <height>267</height>
    </rect>
   </property>
   <property name="minimumSize" >
@@ -552,53 +552,27 @@
       </size>
      </property>
      <property name="title" >
-      <string>Misc</string>
+      <string>Startup</string>
      </property>
-     <widget class="QCheckBox" name="chkShowOnStartup" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>40</y>
-        <width>401</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Show MainWindow at Startup</string>
-      </property>
-      <property name="checked" >
-       <bool>false</bool>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="checkStartMinimized" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>60</y>
-        <width>401</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Start minimized</string>
-      </property>
-      <property name="checked" >
-       <bool>true</bool>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="chkRunRetroshareAtSystemStartup" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>20</y>
-        <width>411</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Start RetroShare when my system starts</string>
-      </property>
-     </widget>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="chkRunRetroshareAtSystemStartup" >
+        <property name="text" >
+         <string>Start RetroShare when my system starts</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QCheckBox" name="checkStartMinimized" >
+        <property name="text" >
+         <string>Start minimized</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item row="2" column="0" >
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 0de9f1405..bad075120 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -25,6 +25,7 @@
 #include <gui/MainWindow.h>
 #include <gui/StartDialog.h>
 #include <gui/GenCertDialog.h>
+#include <gui/Preferences/GeneralDialog.h>
 #include <gui/Preferences/rsharesettings.h>
 #include <gui/connect/ConfCertDialog.h>
 
@@ -59,7 +60,7 @@ int main(int argc, char *argv[])
         bool startMinimised = RsConfigStartMinimised(config);
 	*/
 
-	bool startMinimised = false;
+	//bool startMinimized = false;
 
 	/* Setup The GUI Stuff */
 	Rshare rshare(args, argc, argv, 
@@ -176,7 +177,9 @@ int main(int argc, char *argv[])
 	QObject::connect(ConfCertDialog::instance(),SIGNAL(configChanged()),w->networkDialog,SLOT(insertConnect())) ;
 
 	/* only show window, if not startMinimized */
-	if (!startMinimised)
+	RshareSettings  *_settings = new RshareSettings();
+
+  if(!_settings->value(QString::fromUtf8("StartMinimized"), false).toBool()) 
 	{
 
 		w->show();