diff --git a/src/popup/components/pop-out.component.html b/src/popup/components/pop-out.component.html
index 7562b984a48..c8ae8a606be 100644
--- a/src/popup/components/pop-out.component.html
+++ b/src/popup/components/pop-out.component.html
@@ -1,3 +1,5 @@
-<button (click)="expand()" title="{{'popOutNewWindow' | i18n}}">
-    <i class="fa fa-external-link fa-rotate-270 fa-lg fa-fw"></i>
-</button>
+<ng-container *ngIf="show">
+    <button (click)="expand()" title="{{'popOutNewWindow' | i18n}}">
+        <i class="fa fa-external-link fa-rotate-270 fa-lg fa-fw"></i>
+    </button>
+</ng-container>
diff --git a/src/popup/components/pop-out.component.ts b/src/popup/components/pop-out.component.ts
index 4732e759805..8f62c819d26 100644
--- a/src/popup/components/pop-out.component.ts
+++ b/src/popup/components/pop-out.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    Input,
+} from '@angular/core';
 
 import { Angulartics2 } from 'angulartics2';
 
@@ -13,8 +16,12 @@ import { PopupUtilsService } from '../services/popup-utils.service';
     templateUrl: 'pop-out.component.html',
 })
 export class PopOutComponent {
+    @Input() show = true;
+
     constructor(private analytics: Angulartics2, private platformUtilsService: PlatformUtilsService,
-        private popupUtilsService: PopupUtilsService) { }
+        private popupUtilsService: PopupUtilsService) {
+        this.show = !this.platformUtilsService.isSafari();
+    }
 
     expand() {
         this.analytics.eventTrack.next({ action: 'Pop Out Window' });
diff --git a/src/popup/tools/password-generator.component.html b/src/popup/tools/password-generator.component.html
index 01cdba3a3ad..bde546d72d5 100644
--- a/src/popup/tools/password-generator.component.html
+++ b/src/popup/tools/password-generator.component.html
@@ -1,5 +1,6 @@
 <header>
     <div class="left">
+        <app-pop-out [show]="!showSelect"></app-pop-out>
         <button type="button" appBlurClick (click)="close()" *ngIf="showSelect">{{'cancel' | i18n}}</button>
     </div>
     <div class="center">
diff --git a/src/popup/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html
index 168fb9b91de..94c967f3070 100644
--- a/src/popup/vault/current-tab.component.html
+++ b/src/popup/vault/current-tab.component.html
@@ -1,6 +1,6 @@
 <header>
     <div class="left">
-        <app-pop-out *ngIf="showPopout"></app-pop-out>
+        <app-pop-out [show]="!inSidebar"></app-pop-out>
         <button type="button" appBlurClick (click)="refresh()" title="{{'refresh' | i18n}}" *ngIf="inSidebar">
             <i class="fa fa-refresh fa-lg fa-fw"></i>
         </button>
diff --git a/src/popup/vault/current-tab.component.ts b/src/popup/vault/current-tab.component.ts
index f99da8ea22f..c190d152ee0 100644
--- a/src/popup/vault/current-tab.component.ts
+++ b/src/popup/vault/current-tab.component.ts
@@ -43,7 +43,6 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     searchText: string;
     canAutofill = false;
     inSidebar = false;
-    showPopout = true;
     disableSearch = false;
     loaded = false;
     loadedTimeout: number;
@@ -55,7 +54,6 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
         private ngZone: NgZone, private broadcasterService: BroadcasterService,
         private changeDetectorRef: ChangeDetectorRef, private syncService: SyncService) {
         this.inSidebar = popupUtilsService.inSidebar(window);
-        this.showPopout = !this.inSidebar && !platformUtilsService.isSafari();
         this.disableSearch = platformUtilsService.isEdge();
     }