Index: src/org/jboss/tools/jmx/ui/internal/views/navigator/UpdateSelectionJob.java
===================================================================
--- src/org/jboss/tools/jmx/ui/internal/views/navigator/UpdateSelectionJob.java	(revision 14164)
+++ src/org/jboss/tools/jmx/ui/internal/views/navigator/UpdateSelectionJob.java	(working copy)
@@ -29,8 +29,8 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.navigator.NavigatorContentService;
 import org.eclipse.ui.internal.navigator.NavigatorPlugin;
-import org.eclipse.ui.internal.navigator.extensions.LinkHelperService;
 import org.eclipse.ui.navigator.CommonNavigator;
+import org.eclipse.ui.navigator.LinkHelperService;
 import org.eclipse.ui.progress.UIJob;
 
 public class UpdateSelectionJob extends UIJob {
@@ -55,12 +55,14 @@
 	public UpdateSelectionJob(CommonNavigator commonNavigator) {
 		super("Updating Selection Job"); // TODO 
 		this.commonNavigator = commonNavigator;
-		linkService = new LinkHelperService((NavigatorContentService)commonNavigator.getCommonViewer().getNavigatorContentService());
+		if( commonNavigator instanceof JMXNavigator ) {
+			linkService = ((JMXNavigator)commonNavigator).getLinkHelperService();
+		}
 	}
 
 	public IStatus runInUIThread(IProgressMonitor monitor) {
 
-		if (!commonNavigator.getCommonViewer().getControl().isDisposed()) {
+		if (linkService!= null && !commonNavigator.getCommonViewer().getControl().isDisposed()) {
 			SafeRunner.run(new ISafeRunnable() {
 
 				public void run() throws Exception {
Index: src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java
===================================================================
--- src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java	(revision 13860)
+++ src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java	(working copy)
@@ -20,7 +20,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.internal.navigator.NavigatorContentService;
 import org.eclipse.ui.navigator.CommonNavigator;
+import org.eclipse.ui.navigator.LinkHelperService;
 import org.jboss.tools.jmx.ui.internal.actions.NewConnectionAction;
 
 /**
@@ -72,6 +74,11 @@
 		return filterText;
 	}
 	
+	public synchronized LinkHelperService getLinkHelperService() {
+		return super.getLinkHelperService();
+	}
+
+	
 	public void fillActionBars() {
 //		queryContribution = new QueryContribution(this);
 //	    getViewSite().getActionBars().getToolBarManager().add(queryContribution);