diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIStartup.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIStartup.java
new file mode 100644
index 0000000..327bf4a
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIStartup.java
@@ -0,0 +1,22 @@
+/********************************************************************************
+ * Copyright (c) 2013, 2013 IBM Corporation and others. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * David Dykstal (IBM) - [397995] RSEInitJob starts too early
+ ********************************************************************************/
+
+package org.eclipse.rse.internal.ui;
+
+import org.eclipse.rse.internal.core.RSEInitJob;
+import org.eclipse.ui.IStartup;
+
+public class RSEUIStartup implements IStartup {
+
+	public void earlyStartup() {
+       RSEInitJob.getInstance().schedule();
+	}
+
+}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
index fbfc252..b11f136 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
@@ -388,9 +388,7 @@ public class RSEUIPlugin extends SystemBasePlugin
 	{
         super.start(context);
         
-        RSEInitJob.getInstance().schedule();
-
-	   	messageFile = getMessageFile("systemmessages.xml"); //$NON-NLS-1$
+ 	   	messageFile = getMessageFile("systemmessages.xml"); //$NON-NLS-1$
 	   	defaultMessageFile = getDefaultMessageFile("systemmessages.xml"); //$NON-NLS-1$
 
 	   	//Force load the SystemRegistry - TODO Is this really necessary?
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index 08f1255..903d2dc 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -21,6 +21,7 @@ Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands m
 David McKnight   (IBM)        - [160105] [usability] Universal action needed to locate a resource in the Remote Systems View        
 David McKnight   (IBM)        - [260792] Default prompt text color/background color for Remote Shell view is difficult to see
 Uwe Stieber      (Wind River) - [245039] [contributions][api] Provide property tester implementations in parallel to the older action filters
+David Dykstal    (IBM)        - [397995] RSEInitJob runs too early
 -->
 <?eclipse version="3.1"?>
 <plugin>
@@ -52,6 +53,10 @@ Uwe Stieber      (Wind River) - [245039] [contributions][api] Provide property t
          </run>
       </runtime>
    </extension>
+   
+   <extension point="org.eclipse.ui.startup">
+     <startup class="org.eclipse.rse.internal.ui.RSEUIStartup"/>
+   </extension>
 
 <!-- ============================================ -->
 <!-- Define a RemoteSystems preference page        -->