Require activate to be called explicitly.

src/about/plugin.ts

@@ -44,9 +44,8 @@ function activateAbout(app: JupyterLab, palette: ICommandPalette): void {
     execute: () => {
       if (!widget.isAttached) {
         app.shell.addToMainArea(widget);
-      } else {
-        app.shell.activateMain(widget.id);
       }
+      app.shell.activateMain(widget.id);
     }
   });
   palette.addItem({ command, category: 'Help' });

src/application/shell.ts

@@ -234,7 +234,6 @@ class ApplicationShell extends Widget {
       return;
     }
     this._dockPanel.addWidget(widget, { mode: 'tab-after' });
-    this._dockPanel.activateWidget(widget);
   }
 
   /**

src/console/plugin.ts

@@ -347,6 +347,7 @@ function activateConsole(app: JupyterLab, services: IServiceManager, rendermime:
     panel.title.icon = `${LANDSCAPE_ICON_CLASS} ${CONSOLE_ICON_CLASS}`;
     panel.title.closable = true;
     app.shell.addToMainArea(panel);
+    app.shell.activateMain(panel.id);
     // Update the caption of the tab with the last execution time.
     panel.content.executed.connect((sender, executed) => {
       captionOptions.executed = executed;

src/faq/plugin.ts

@@ -333,9 +333,8 @@ function activateFAQ(app: JupyterLab, palette: ICommandPalette): void {
     execute: () => {
       if (!widget.isAttached) {
         app.shell.addToMainArea(widget);
-      } else {
-        app.shell.activateMain(widget.id);
       }
+      app.shell.activateMain(widget.id);
     }
   });
 

src/inspector/plugin.ts

@@ -105,11 +105,9 @@ function activateInspector(app: JupyterLab, palette: ICommandPalette): IInspecto
     if (!manager.inspector || manager.inspector.isDisposed) {
       manager.inspector = newInspector();
       app.shell.addToMainArea(manager.inspector);
-      return;
     }
     if (manager.inspector.isAttached) {
       app.shell.activateMain(manager.inspector.id);
-      return;
     }
   }
 

src/landing/plugin.ts

@@ -139,9 +139,8 @@ function activateLanding(app: JupyterLab, services: IServiceManager, pathTracker
     execute: () => {
       if (!widget.isAttached) {
         app.shell.addToMainArea(widget);
-      } else {
-        app.shell.activateMain(widget.id);
       }
+      app.shell.activateMain(widget.id);
     }
   });
 
@@ -151,4 +150,5 @@ function activateLanding(app: JupyterLab, services: IServiceManager, pathTracker
   });
 
   app.shell.addToMainArea(widget);
+  app.shell.activateMain(widget.id);
 }

src/terminal/plugin.ts

@@ -89,6 +89,7 @@ function activateTerminal(app: JupyterLab, services: IServiceManager, mainMenu:
       term.title.closable = true;
       term.title.icon = `${LANDSCAPE_ICON_CLASS} ${TERMINAL_ICON_CLASS}`;
       app.shell.addToMainArea(term);
+      app.shell.activateMain(term.id);
       tracker.add(term);
       let promise: Promise<TerminalSession.ISession>;
       if (name) {