diff --git a/src/vs/workbench/browser/actions/navigationActions.ts b/src/vs/workbench/browser/actions/navigationActions.ts
index 5e80d459df037b52d7ec15de4e1ac30f252329b6..bc0bc3a7ada67b3c77b78b5f0bc0add212ad4166 100644
--- a/src/vs/workbench/browser/actions/navigationActions.ts
+++ b/src/vs/workbench/browser/actions/navigationActions.ts
@@ -68,7 +68,7 @@ abstract class BaseNavigationAction extends Action {
 			return false;
 		}
 
-		const activePanelId = this.panelService.getActivePanel().getId();
+		const activePanelId = this.panelService.getActivePanel()!.getId();
 
 		return this.panelService.openPanel(activePanelId, true);
 	}
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
index 4cd74b0ebbe748fb816d07a8ba8edb60ee0e427d..f91feedc0d160bc4a852320e8c57e9ad189584cf 100644
--- a/src/vs/workbench/browser/panel.ts
+++ b/src/vs/workbench/browser/panel.ts
@@ -95,7 +95,7 @@ export abstract class TogglePanelAction extends Action {
 	private isPanelActive(): boolean {
 		const activePanel = this.panelService.getActivePanel();
 
-		return activePanel && activePanel.getId() === this.panelId;
+		return !!activePanel && activePanel.getId() === this.panelId;
 	}
 
 	private isPanelFocused(): boolean {
diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts
index b9ca8a82b5157f6d74a53d530e068e6911754b07..0a38e48b7fd8d038dbb0a97e5b1ead3c0458399c 100644
--- a/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts
@@ -924,7 +924,7 @@ export class TerminalInstance implements ITerminalInstance {
 
 	private _refreshSelectionContextKey() {
 		const activePanel = this._panelService.getActivePanel();
-		const isActive = activePanel && activePanel.getId() === TERMINAL_PANEL_ID;
+		const isActive = !!activePanel && activePanel.getId() === TERMINAL_PANEL_ID;
 
 		this._terminalHasTextContextKey.set(isActive && this.hasSelection());
 	}
diff --git a/src/vs/workbench/services/timer/electron-browser/timerService.ts b/src/vs/workbench/services/timer/electron-browser/timerService.ts
index c8a351276652b8eb146c36688d635bf28ae5b866..be1ba98ee645c1373ca48bc911277c038e4033a4 100644
--- a/src/vs/workbench/services/timer/electron-browser/timerService.ts
+++ b/src/vs/workbench/services/timer/electron-browser/timerService.ts
@@ -378,6 +378,7 @@ class TimerService implements ITimerService {
 		}
 
 		const activeViewlet = this._viewletService.getActiveViewlet();
+		const activePanel = this._panelService.getActivePanel();
 		return {
 			version: 2,
 			ellapsed: perf.getDuration(startMark, 'didStartWorkbench'),
@@ -389,7 +390,7 @@ class TimerService implements ITimerService {
 			windowCount: await this._windowsService.getWindowCount(),
 			viewletId: activeViewlet ? activeViewlet.getId() : undefined,
 			editorIds: this._editorService.visibleEditors.map(input => input.getTypeId()),
-			panelId: this._panelService.getActivePanel() ? this._panelService.getActivePanel().getId() : undefined,
+			panelId: activePanel ? activePanel.getId() : undefined,
 
 			// timers
 			timers: {