diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
index b2ceb2f2a8..968efe1bf5 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
@@ -566,6 +566,8 @@ public IWorkspace addingService(ServiceReference<IWorkspace> reference) {
 					return null;
 				}
 				try {
+					InstanceScope.INSTANCE.getNode(ID_PLUGIN).addPreferenceChangeListener(LaunchingPlugin.this);
+					workspace.addResourceChangeListener(LaunchingPlugin.this, IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
 					workspace.addSaveParticipant(ID_PLUGIN, new ISaveParticipant() {
 						@Override
 						public void doneSaving(ISaveContext context1) {}
@@ -601,9 +603,7 @@ public void removedService(ServiceReference<IWorkspace> reference, IWorkspace se
 		};
 		fWorkspaceServiceTracker.open();
 
-		InstanceScope.INSTANCE.getNode(ID_PLUGIN).addPreferenceChangeListener(this);
 		JavaRuntime.addVMInstallChangedListener(this);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
 		DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this);
 		DebugPlugin.getDefault().addDebugEventListener(this);
 		AdvancedSourceLookupSupport.start();
@@ -1331,4 +1331,4 @@ public static void trace(String message) {
 		trace(null, message, null);
 	}
 
-}
\ No newline at end of file
+}