diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
index 2deac82d69..760019b578 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.osgi.framework.Bundle;
 
 import com.raytheon.uf.common.comm.HttpClient;
@@ -52,6 +51,7 @@ import com.raytheon.uf.viz.thinclient.localization.LocalizationCachePersistence;
 import com.raytheon.uf.viz.thinclient.localization.ThinClientLocalizationInitializer;
 import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
 import com.raytheon.uf.viz.thinclient.refresh.TimedRefresher;
+import com.raytheon.viz.ui.personalities.awips.AWIPSWorkbenchAdvisor;
 import com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent;
 import com.raytheon.viz.ui.personalities.awips.CAVE;
 
@@ -178,12 +178,11 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
     /*
      * (non-Javadoc)
      * 
-     * @see com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent#
-     * getWorkbenchAdvisor()
+     * @see com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent#
+     * createAWIPSWorkbenchAdvisor()
      */
     @Override
-    protected WorkbenchAdvisor getWorkbenchAdvisor() {
-        // Use custom workbench advisor, will add thin client preferences page
+    protected AWIPSWorkbenchAdvisor createAWIPSWorkbenchAdvisor() {
         return new ThinClientWorkbenchAdvisor();
     }
 
diff --git a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java
index 24cd626268..1521625b16 100644
--- a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java
+++ b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java
@@ -122,10 +122,10 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication {
      * getWorkbenchAdvisor()
      */
     @Override
-    protected WorkbenchAdvisor getWorkbenchAdvisor() {
+    protected final WorkbenchAdvisor getWorkbenchAdvisor() {
         WorkbenchAdvisor workbenchAdvisor = null;
         if ((getRuntimeModes() & WORKBENCH) != 0) {
-            workbenchAdvisor = new AWIPSWorkbenchAdvisor();
+            workbenchAdvisor = createAWIPSWorkbenchAdvisor();
         } else if (!isNonUIComponent()) {
             workbenchAdvisor = new HiddenWorkbenchAdvisor(getComponentName(),
                     this);
@@ -141,6 +141,14 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication {
         return workbenchAdvisor;
     }
 
+    /**
+     * @return A new instance of {@link AWIPSWorkbenchAdvisor} to use for the
+     *         component's {@link WorkbenchAdvisor}
+     */
+    protected AWIPSWorkbenchAdvisor createAWIPSWorkbenchAdvisor() {
+        return new AWIPSWorkbenchAdvisor();
+    }
+
     /*
      * (non-Javadoc)
      *