diff --git a/core/ui/src/main/java/org/phoebus/ui/help/HelpApplication.java b/core/ui/src/main/java/org/phoebus/ui/help/HelpApplication.java
deleted file mode 100644
index 3126f5dfe4..0000000000
--- a/core/ui/src/main/java/org/phoebus/ui/help/HelpApplication.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Oak Ridge National Laboratory.
- * 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
- *******************************************************************************/
-package org.phoebus.ui.help;
-
-import org.phoebus.framework.spi.AppDescriptor;
-import org.phoebus.framework.spi.AppInstance;
-import org.phoebus.ui.application.Messages;
-
-/** 'Help' application descriptor
- *  @author Kay Kasemir
- */
-@SuppressWarnings("nls")
-public class HelpApplication implements AppDescriptor
-{
-    public static final String NAME = "help";
-    public static final String DISPLAY_NAME = Messages.Help;
-
-    @Override
-    public String getName()
-    {
-        return NAME;
-    }
-
-    @Override
-    public String getDisplayName()
-    {
-        return DISPLAY_NAME;
-    }
-
-    @Override
-    public AppInstance create()
-    {
-        if (HelpBrowser.INSTANCE == null)
-            HelpBrowser.INSTANCE = new HelpBrowser(this);
-        else
-            HelpBrowser.INSTANCE.raise();
-        return HelpBrowser.INSTANCE;
-    }
-}
diff --git a/core/ui/src/main/java/org/phoebus/ui/help/HelpBrowser.java b/core/ui/src/main/java/org/phoebus/ui/help/HelpBrowser.java
deleted file mode 100644
index 403ec79b53..0000000000
--- a/core/ui/src/main/java/org/phoebus/ui/help/HelpBrowser.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017-2020 Oak Ridge National Laboratory.
- * 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
- *******************************************************************************/
-package org.phoebus.ui.help;
-
-import static org.phoebus.ui.application.PhoebusApplication.logger;
-
-import java.io.File;
-import java.util.logging.Level;
-
-import org.phoebus.framework.jobs.JobManager;
-import org.phoebus.framework.jobs.JobMonitor;
-import org.phoebus.framework.spi.AppDescriptor;
-import org.phoebus.framework.spi.AppInstance;
-import org.phoebus.framework.workbench.Locations;
-import org.phoebus.ui.application.Messages;
-import org.phoebus.ui.docking.DockItem;
-import org.phoebus.ui.docking.DockPane;
-
-import javafx.application.Platform;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.web.WebView;
-
-/** Web browser that displays help
- *  @author Kay Kasemir
- */
-@SuppressWarnings("nls")
-public class HelpBrowser implements AppInstance
-{
-    /** At most one instance */
-    static HelpBrowser INSTANCE = null;
-
-    private final AppDescriptor app;
-
-    private DockItem dock_item = null;
-
-    private WebView browser;
-
-    HelpBrowser(final AppDescriptor app)
-    {
-        this.app = app;
-
-        browser = new WebView();
-        dock_item = new DockItem(this, new BorderPane(browser))
-        {
-            // Add 'Web URL'
-            @Override
-            protected void fillInformation(final StringBuilder info)
-            {
-                super.fillInformation(info);
-                info.append("\n");
-                info.append(Messages.HelpPage).append(browser.getEngine().getLocation());
-            }
-        };
-        dock_item.addClosedNotification(this::dispose);
-        DockPane.getActiveDockPane().addTab(dock_item);
-
-        JobManager.schedule(app.getDisplayName(), this::loadHelp);
-    }
-
-    private void loadHelp(final JobMonitor monitor)
-    {
-        final String location = determineHelpLocation();
-        logger.log(Level.CONFIG, "Showing help from " + location);
-        Platform.runLater(() -> browser.getEngine().load(location));
-    }
-
-    public static String determineHelpLocation()
-    {
-        final File phoenix_install = Locations.install();
-
-        // The distribution includes a lib/ and a doc/ folder.
-        // Check for the doc/index.html
-        File loc = new File(phoenix_install, "doc/index.html");
-        if (loc.exists())
-            return loc.toURI().toString();
-
-        // During development,
-        // product is started from IDE as ....../git/phoebus/phoebus-product.
-        // Check for copy of docs in      ....../git/phoebus/docs/build/html
-        loc = new File(phoenix_install, "docs");
-        if (loc.exists())
-        {
-            loc = new File(loc, "build/html/index.html");
-            if (loc.exists())
-                return loc.toURI().toString();
-            logger.log(Level.WARNING, "Found phoebus-doc repository, but no build/html/index.html. Run 'make html'");
-        }
-
-        // Fall back to online copy of the manual
-        return "https://control-system-studio.readthedocs.io";
-    }
-
-    @Override
-    public AppDescriptor getAppDescriptor()
-    {
-        return app;
-    }
-
-    /** Show the existing singleton instance */
-    public void raise()
-    {
-        dock_item.select();
-    }
-
-    private void dispose()
-    {
-        INSTANCE = null;
-    }
-}
diff --git a/core/ui/src/main/java/org/phoebus/ui/help/OpenHelp.java b/core/ui/src/main/java/org/phoebus/ui/help/OpenHelp.java
index bec75e920b..923624ca08 100644
--- a/core/ui/src/main/java/org/phoebus/ui/help/OpenHelp.java
+++ b/core/ui/src/main/java/org/phoebus/ui/help/OpenHelp.java
@@ -7,12 +7,20 @@
  *******************************************************************************/
 package org.phoebus.ui.help;
 
-import org.phoebus.framework.workbench.ApplicationService;
+import org.phoebus.framework.workbench.Locations;
 import org.phoebus.ui.application.Messages;
 import org.phoebus.ui.javafx.ImageCache;
 import org.phoebus.ui.spi.MenuEntry;
 
 import javafx.scene.image.Image;
+import org.phoebus.ui.web.WebBrowserApplication;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.logging.Level;
+
+import static org.phoebus.ui.application.PhoebusApplication.logger;
 
 /** Menu entry to open help
  *  @author Kay Kasemir
@@ -23,7 +31,7 @@ public class OpenHelp implements MenuEntry
     @Override
     public String getName()
     {
-        return HelpApplication.DISPLAY_NAME;
+        return Messages.Help;
     }
 
     @Override
@@ -41,7 +49,39 @@ public Image getIcon()
     @Override
     public Void call()
     {
-        ApplicationService.createInstance(HelpApplication.NAME);
+        try {
+            URI helpLocationURI = new URI(determineHelpLocation());
+            WebBrowserApplication webBrowserApplication = new WebBrowserApplication();
+            webBrowserApplication.create(helpLocationURI);
+        } catch (URISyntaxException uriSyntaxException) {
+            throw new RuntimeException(uriSyntaxException);
+        }
         return null;
     }
+
+    public static String determineHelpLocation()
+    {
+        final File phoenix_install = Locations.install();
+
+        // The distribution includes a lib/ and a doc/ folder.
+        // Check for the doc/index.html
+        File loc = new File(phoenix_install, "doc/index.html");
+        if (loc.exists())
+            return loc.toURI().toString();
+
+        // During development,
+        // product is started from IDE as ....../git/phoebus/phoebus-product.
+        // Check for copy of docs in      ....../git/phoebus/docs/build/html
+        loc = new File(phoenix_install, "docs");
+        if (loc.exists())
+        {
+            loc = new File(loc, "build/html/index.html");
+            if (loc.exists())
+                return loc.toURI().toString();
+            logger.log(Level.WARNING, "Found phoebus-doc repository, but no build/html/index.html. Run 'make html'");
+        }
+
+        // Fall back to online copy of the manual
+        return "https://control-system-studio.readthedocs.io";
+    }
 }
diff --git a/core/ui/src/main/resources/META-INF/services/org.phoebus.framework.spi.AppDescriptor b/core/ui/src/main/resources/META-INF/services/org.phoebus.framework.spi.AppDescriptor
index dcd5f98d8c..2601e589d2 100644
--- a/core/ui/src/main/resources/META-INF/services/org.phoebus.framework.spi.AppDescriptor
+++ b/core/ui/src/main/resources/META-INF/services/org.phoebus.framework.spi.AppDescriptor
@@ -1,5 +1,4 @@
 org.phoebus.ui.welcome.Welcome
 org.phoebus.ui.pv.PVListApplication
 org.phoebus.ui.jobs.JobViewerApplication
-org.phoebus.ui.help.HelpApplication
 org.phoebus.ui.web.WebBrowserApplication
\ No newline at end of file